Merge branch 'ia/public_key/PKCS-10-usage-of-PKCS-9'

* ia/public_key/PKCS-10-usage-of-PKCS-9:
  public_key: Include some PKCS-9 support needed by PKCS-10

1 files changed, 25 insertions, 1 deletions

diff --git a/lib/public_key/asn1/PKCS-10.asn1 b/lib/public_key/asn1/PKCS-10.asn1
index 333104d230..5ada81c257 100644
--- a/lib/public_key/asn1/PKCS-10.asn1
+++ b/lib/public_key/asn1/PKCS-10.asn1
@@ -20,12 +20,36 @@ IMPORTS
     ATTRIBUTE
     FROM InformationFramework informationFramework
 
-    Name
+    Name, Extensions, DirectoryString
     FROM PKIX1Explicit88 --InformationFramework informationFramework
 
     ALGORITHM
        FROM PKCS-7; --AuthenticationFramework authenticationFramework;
 
+-- start inlined from PKCS-9
+
+--pkcs-9-ub-pkcs9String          		INTEGER ::= 255
+--pkcs-9-ub-challengePassword     	INTEGER ::= pkcs-9-ub-pkcs9String
+pkcs-9-at-challengePassword             OBJECT IDENTIFIER ::= {pkcs-9 7}
+
+challengePassword ATTRIBUTE ::= {
+        WITH SYNTAX DirectoryString --{pkcs-9-ub-challengePassword}
+        SINGLE VALUE TRUE
+        ID pkcs-9-at-challengePassword
+}
+
+pkcs-9-at-extensionRequest              OBJECT IDENTIFIER ::= {pkcs-9 14}
+
+extensionRequest ATTRIBUTE ::= {
+        WITH SYNTAX ExtensionRequest
+        SINGLE VALUE TRUE
+        ID pkcs-9-at-extensionRequest
+}
+
+ExtensionRequest ::= Extensions
+
+-- end inlined from PKCS-9
+       
 -- Certificate requests
 
 CertificationRequestInfo ::= SEQUENCE {