diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-11-22 03:36:26 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-11-22 03:36:26 +0000 |
| commit | f102c2015121c6c5f0eefadf63d15555f5ea589e (patch) | |
| tree | c67f5adb01fb991f94b3b6ae7e518c075a87fa30 /asn1/cms | |
| parent | 117d9d7ee483930322bfeb7a06d1314d7e29a9a5 (diff) | |
New protocol: RFC2634 ExtendedSecurityServices
updates to cms to accomodate the new protocol
add author to some files
svn path=/trunk/; revision=12573
Diffstat (limited to 'asn1/cms')
| -rwxr-xr-x | asn1/cms/Makefile | 5 | ||||
| -rw-r--r-- | asn1/cms/cms-exp.cnf | 30 | ||||
| -rw-r--r-- | asn1/cms/cms.cnf | 12 | ||||
| -rw-r--r-- | asn1/cms/cms_exp.cnf | 19 | ||||
| -rw-r--r-- | asn1/cms/packet-cms-template.c | 1 | ||||
| -rw-r--r-- | asn1/cms/packet-cms-template.h | 1 |
6 files changed, 46 insertions, 22 deletions
diff --git a/asn1/cms/Makefile b/asn1/cms/Makefile new file mode 100755 index 0000000000..3124abcd03 --- /dev/null +++ b/asn1/cms/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-cms.c : ../../tools/asn2eth.py CryptographicMessageSyntax.asn packet-cms-template.c packet-cms-template.h cms.cnf + python ../../tools/asn2eth.py -X -b -k -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn + cp packet-cms.* ../../epan/dissectors + diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf new file mode 100644 index 0000000000..9fbeb1ab7c --- /dev/null +++ b/asn1/cms/cms-exp.cnf @@ -0,0 +1,30 @@ +#.IMPORT_TAG +ContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +ContentType BER_CLASS_UNI BER_UNI_TAG_OID +SignedData BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +DigestAlgorithmIdentifiers BER_CLASS_UNI BER_UNI_TAG_SET +SignerInfos BER_CLASS_UNI BER_UNI_TAG_SET +EncapsulatedContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +SignerInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +SignerIdentifier -1/*choice*/ -1/*choice*/ +SignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET +UnsignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET +SignatureValue BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING +IssuerAndSerialNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +#.END + +#.TYPE_ATTR +ContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ContentType TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +SignedData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +DigestAlgorithmIdentifiers TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +SignerInfos TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +EncapsulatedContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +SignerInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +SignerIdentifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(SignerIdentifier_vals) BITMASK = 0 +SignedAttributes TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +UnsignedAttributes TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +SignatureValue TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 +IssuerAndSerialNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +#.END + diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index aeead66849..ca6f88f3f4 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -12,11 +12,17 @@ InformationFramework x509if #.EXPORTS ContentInfo +ContentType +DigestAlgorithmIdentifiers EncapsulatedContentInfo -SignedData -Countersignature IssuerAndSerialNumber -OtherKeyAttribute +SignedAttributes +SignedData +SignerIdentifier +SignerInfo +SignerInfos +SignatureValue +UnsignedAttributes #.REGISTER SignedData B "1.2.840.113549.1.7.2" "id-signedData" diff --git a/asn1/cms/cms_exp.cnf b/asn1/cms/cms_exp.cnf deleted file mode 100644 index 97673d6923..0000000000 --- a/asn1/cms/cms_exp.cnf +++ /dev/null @@ -1,19 +0,0 @@ -# Do not modify this file. -# It is created automatically by the ASN.1 to Ethereal dissector compiler -# ./cms-exp.cnf -# ../../tools/asn2eth.py -e -X -b -p cms -c cms.cnf CryptographicMessageSyntax.asn - -#.IMPORT_TAG -ContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -SignedData BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -IssuerAndSerialNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Countersignature BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -#.END - -#.TYPE_ATTR -ContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -SignedData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -IssuerAndSerialNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Countersignature TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -#.END - diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 86d478fd14..439f23e267 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -1,5 +1,6 @@ /* packet-cms.c * Routines for RFC2630 Cryptographic Message Syntax packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * diff --git a/asn1/cms/packet-cms-template.h b/asn1/cms/packet-cms-template.h index 3479f9a55f..6284c15eef 100644 --- a/asn1/cms/packet-cms-template.h +++ b/asn1/cms/packet-cms-template.h @@ -1,5 +1,6 @@ /* packet-cms.h * Routines for RFC2630 Cryptographic Message Syntax packet dissection + * Ronnie Sahlberg 2004 * * $Id$ * |