diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-11-06 02:06:55 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-11-06 02:06:55 +0000 |
| commit | d1e31a5c200ea6c2d4f71d106d1ce25d06d86bc6 (patch) | |
| tree | 1815d98447cb91f52c636b9f35b1a7bd4e8e23e7 /asn1/cms | |
| parent | 05cf6b7ced060fe062ca12eb3b3e3344f560f727 (diff) | |
make CMS use the new ANY type and get rid of the workaround
svn path=/trunk/; revision=12491
Diffstat (limited to 'asn1/cms')
| -rw-r--r-- | asn1/cms/CryptographicMessageSyntax.asn | 7 | ||||
| -rw-r--r-- | asn1/cms/cms.cnf | 1 | ||||
| -rw-r--r-- | asn1/cms/cms_dummy.cnf | 5 |
3 files changed, 2 insertions, 11 deletions
diff --git a/asn1/cms/CryptographicMessageSyntax.asn b/asn1/cms/CryptographicMessageSyntax.asn index 9753922875..5ad4f981a4 100644 --- a/asn1/cms/CryptographicMessageSyntax.asn +++ b/asn1/cms/CryptographicMessageSyntax.asn @@ -11,9 +11,6 @@ BEGIN -- own purposes. IMPORTS - Any - FROM DummyCms { 0 } - -- Directory Information Framework (X.501) Name FROM InformationFramework { joint-iso-itu-t ds(5) modules(1) @@ -32,7 +29,7 @@ IMPORTS ContentInfo ::= SEQUENCE { contentType ContentType, - content [0] EXPLICIT Any + content [0] EXPLICIT ANY } @@ -226,7 +223,7 @@ UserKeyingMaterial ::= OCTET STRING OtherKeyAttribute ::= SEQUENCE { keyAttrId OBJECT IDENTIFIER, - keyAttr Any OPTIONAL + keyAttr ANY OPTIONAL } -- CMS Attributes diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 100c3656fe..3b645eedac 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -9,7 +9,6 @@ InformationFramework x509if #.INCLUDE ../x509af/x509af_exp.cnf #.INCLUDE ../x509if/x509if_exp.cnf -#.INCLUDE ./cms_dummy.cnf #.EXPORTS ContentInfo diff --git a/asn1/cms/cms_dummy.cnf b/asn1/cms/cms_dummy.cnf deleted file mode 100644 index a672cfcb6a..0000000000 --- a/asn1/cms/cms_dummy.cnf +++ /dev/null @@ -1,5 +0,0 @@ -# this dummy is to handle Any type until compiler knows -# about ANY - -#.IMPORT_TAG -Any BER_CLASS_ANY 0 |