public_key: Simplified PKCS-7 and PKCS-10 specs.

Used defenitions from PKIX1Explicit88 to avoid most
of the overcomplicated InformationalFrameWork (and friends) ASN-1 specs.
We want to keep the public_key API as small and simple as possible.

1 files changed, 18 insertions, 15 deletions

diff --git a/lib/public_key/asn1/PKCS-10.asn1 b/lib/public_key/asn1/PKCS-10.asn1
index 09db4f9460..333104d230 100644
--- a/lib/public_key/asn1/PKCS-10.asn1
+++ b/lib/public_key/asn1/PKCS-10.asn1
@@ -13,50 +13,53 @@ BEGIN
 
 IMPORTS
 
-informationFramework, authenticationFramework
-    FROM UsefulDefinitions {joint-iso-itu-t(2) ds(5) module(1)
-    usefulDefinitions(0) 3}
+--informationFramework, authenticationFramework
+--    FROM UsefulDefinitions {joint-iso-itu-t(2) ds(5) module(1)
+--    usefulDefinitions(0) 3}
 
-ATTRIBUTE, Name
+    ATTRIBUTE
     FROM InformationFramework informationFramework
 
-ALGORITHM
-    FROM AuthenticationFramework authenticationFramework;
+    Name
+    FROM PKIX1Explicit88 --InformationFramework informationFramework
+
+    ALGORITHM
+       FROM PKCS-7; --AuthenticationFramework authenticationFramework;
 
 -- Certificate requests
 
 CertificationRequestInfo ::= SEQUENCE {
     version       INTEGER { v1(0) } (v1,...),
     subject       Name,
-    subjectPKInfo SubjectPublicKeyInfo{{ PKInfoAlgorithms }},
+    subjectPKInfo SubjectPublicKeyInfo-PKCS-10{{ PKInfoAlgorithms }},
     attributes    [0] Attributes{{ CRIAttributes }}
 }
 
-SubjectPublicKeyInfo {ALGORITHM: IOSet} ::= SEQUENCE {
-    algorithm		AlgorithmIdentifier {{IOSet}},
+SubjectPublicKeyInfo-PKCS-10 {ALGORITHM: IOSet} ::= SEQUENCE {
+    algorithm		AlgorithmIdentifierPKCS-10{{IOSet}},
     subjectPublicKey 	BIT STRING
 }
 
 PKInfoAlgorithms ALGORITHM ::= {
     ... -- add any locally defined algorithms here -- }
 
-Attributes { ATTRIBUTE:IOSet } ::= SET OF Attribute{{ IOSet }}
+Attributes { ATTRIBUTE:IOSet } ::= SET OF AttributePKCS-10{{ IOSet }}
 
 CRIAttributes  ATTRIBUTE  ::= {
-    ... -- add any locally defined attributes here -- }
+... -- add any locally defined attributes here -- }
 
-Attribute { ATTRIBUTE:IOSet } ::= SEQUENCE {
+AttributePKCS-10 { ATTRIBUTE:IOSet } ::= SEQUENCE {
     type   	ATTRIBUTE.&id({IOSet}),
     values 	SET SIZE(1..MAX) OF ATTRIBUTE.&Type({IOSet}{@type})
 }
 
 CertificationRequest ::= SEQUENCE {
     certificationRequestInfo CertificationRequestInfo,
-    signatureAlgorithm	     AlgorithmIdentifier{{ SignatureAlgorithms }},
+    signatureAlgorithm	     AlgorithmIdentifierPKCS-10{{ SignatureAlgorithms }},
     signature                BIT STRING
 }
 
-AlgorithmIdentifier {ALGORITHM:IOSet } ::= SEQUENCE {
+AlgorithmIdentifierPKCS-10 {ALGORITHM:IOSet } ::= SEQUENCE {
     algorithm  	ALGORITHM.&id({IOSet}),
     parameters 	ALGORITHM.&Type({IOSet}{@algorithm}) OPTIONAL
 }
@@ -64,4 +67,4 @@ AlgorithmIdentifier {ALGORITHM:IOSet } ::= SEQUENCE {
 SignatureAlgorithms ALGORITHM ::= {
     ... -- add any locally defined algorithms here -- }
 
-END
\ No newline at end of file
+END