handle IMPLICIT and share some common structures
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15710 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -24,6 +24,7 @@ DigestAlgorithmIdentifiers ::= SET OF DigestAlgorithmIdentifier
|
|||||||
SignatureAlgorithmIdentifier ::= AlgorithmIdentifier
|
SignatureAlgorithmIdentifier ::= AlgorithmIdentifier
|
||||||
|
|
||||||
ContentType ::= OBJECT IDENTIFIER
|
ContentType ::= OBJECT IDENTIFIER
|
||||||
|
MessageDigest ::= OCTET STRING
|
||||||
|
|
||||||
ContentInfo ::= SEQUENCE {
|
ContentInfo ::= SEQUENCE {
|
||||||
contentType ContentType,
|
contentType ContentType,
|
||||||
@@ -35,8 +36,7 @@ EncapsulatedContentInfo ::= SEQUENCE {
|
|||||||
eContent [0] EXPLICIT OCTET STRING OPTIONAL
|
eContent [0] EXPLICIT OCTET STRING OPTIONAL
|
||||||
}
|
}
|
||||||
|
|
||||||
CertificateSet ::= heim_any_set -- SET OF
|
CertificateSet ::= SET OF heim_any
|
||||||
CertificateSetReal ::= SET OF heim_any
|
|
||||||
|
|
||||||
CertificateList ::= Certificate
|
CertificateList ::= Certificate
|
||||||
|
|
||||||
@@ -58,8 +58,10 @@ CMSIdentifier ::= CHOICE {
|
|||||||
SignerIdentifier ::= CMSIdentifier
|
SignerIdentifier ::= CMSIdentifier
|
||||||
RecipientIdentifier ::= CMSIdentifier
|
RecipientIdentifier ::= CMSIdentifier
|
||||||
|
|
||||||
SignedAttributes ::= SET OF Attribute -- SIZE (1..MAX)
|
--- CMSAttributes are the combined UnsignedAttributes and SignedAttributes
|
||||||
UnsignedAttributes ::= SET OF Attribute -- SIZE (1..MAX)
|
--- to store space and share code
|
||||||
|
|
||||||
|
CMSAttributes ::= SET OF Attribute -- SIZE (1..MAX)
|
||||||
|
|
||||||
SignatureValue ::= OCTET STRING
|
SignatureValue ::= OCTET STRING
|
||||||
|
|
||||||
@@ -67,10 +69,12 @@ SignerInfo ::= SEQUENCE {
|
|||||||
version CMSVersion,
|
version CMSVersion,
|
||||||
sid SignerIdentifier,
|
sid SignerIdentifier,
|
||||||
digestAlgorithm DigestAlgorithmIdentifier,
|
digestAlgorithm DigestAlgorithmIdentifier,
|
||||||
signedAttrs [0] IMPLICIT SignedAttributes OPTIONAL,
|
signedAttrs [0] IMPLICIT -- CMSAttributes --
|
||||||
|
SET OF Attribute OPTIONAL,
|
||||||
signatureAlgorithm SignatureAlgorithmIdentifier,
|
signatureAlgorithm SignatureAlgorithmIdentifier,
|
||||||
signature SignatureValue,
|
signature SignatureValue,
|
||||||
unsignedAttrs [1] IMPLICIT UnsignedAttributes OPTIONAL
|
unsignedAttrs [1] IMPLICIT -- CMSAttributes --
|
||||||
|
SET OF Attribute OPTIONAL
|
||||||
}
|
}
|
||||||
|
|
||||||
SignerInfos ::= SET OF SignerInfo
|
SignerInfos ::= SET OF SignerInfo
|
||||||
@@ -79,14 +83,18 @@ SignedData ::= SEQUENCE {
|
|||||||
version CMSVersion,
|
version CMSVersion,
|
||||||
digestAlgorithms DigestAlgorithmIdentifiers,
|
digestAlgorithms DigestAlgorithmIdentifiers,
|
||||||
encapContentInfo EncapsulatedContentInfo,
|
encapContentInfo EncapsulatedContentInfo,
|
||||||
certificates [0] IMPLICIT CertificateSet OPTIONAL,
|
certificates [0] IMPLICIT -- CertificateSet --
|
||||||
crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
|
SET OF heim_any OPTIONAL,
|
||||||
|
crls [1] IMPLICIT -- CertificateRevocationLists --
|
||||||
|
heim_any OPTIONAL,
|
||||||
signerInfos SignerInfos
|
signerInfos SignerInfos
|
||||||
}
|
}
|
||||||
|
|
||||||
OriginatorInfo ::= SEQUENCE {
|
OriginatorInfo ::= SEQUENCE {
|
||||||
certs [0] IMPLICIT CertificateSet OPTIONAL,
|
certs [0] IMPLICIT -- CertificateSet --
|
||||||
crls [1] IMPLICIT CertificateRevocationLists OPTIONAL
|
SET OF heim_any OPTIONAL,
|
||||||
|
crls [1] IMPLICIT --CertificateRevocationLists --
|
||||||
|
heim_any OPTIONAL
|
||||||
}
|
}
|
||||||
|
|
||||||
KeyEncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
|
KeyEncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
|
||||||
@@ -118,15 +126,17 @@ UnprotectedAttributes ::= SET OF Attribute -- SIZE (1..MAX)
|
|||||||
CMSEncryptedData ::= SEQUENCE {
|
CMSEncryptedData ::= SEQUENCE {
|
||||||
version CMSVersion,
|
version CMSVersion,
|
||||||
encryptedContentInfo EncryptedContentInfo,
|
encryptedContentInfo EncryptedContentInfo,
|
||||||
unprotectedAttrs [1] IMPLICIT UnprotectedAttributes OPTIONAL
|
unprotectedAttrs [1] IMPLICIT -- UnprotectedAttributes --
|
||||||
|
heim_any OPTIONAL
|
||||||
}
|
}
|
||||||
|
|
||||||
EnvelopedData ::= SEQUENCE {
|
EnvelopedData ::= SEQUENCE {
|
||||||
version CMSVersion,
|
version CMSVersion,
|
||||||
originatorInfo [0] IMPLICIT OriginatorInfo OPTIONAL,
|
originatorInfo [0] IMPLICIT -- OriginatorInfo -- heim_any OPTIONAL,
|
||||||
recipientInfos RecipientInfos,
|
recipientInfos RecipientInfos,
|
||||||
encryptedContentInfo EncryptedContentInfo,
|
encryptedContentInfo EncryptedContentInfo,
|
||||||
unprotectedAttrs [1] IMPLICIT UnprotectedAttributes OPTIONAL
|
unprotectedAttrs [1] IMPLICIT -- UnprotectedAttributes --
|
||||||
|
heim_any OPTIONAL
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Data ::= OCTET STRING
|
-- Data ::= OCTET STRING
|
||||||
|
Reference in New Issue
Block a user