3 files changed, 70 insertions, 1 deletions
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
index 4b4db9ec6d..c8426411d3 100644
--- a/lib/public_key/asn1/Makefile
+++ b/lib/public_key/asn1/Makefile
@@ -40,7 +40,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/public_key-$(VSN)
 
 ASN_TOP = OTP-PUB-KEY PKCS-FRAME
 ASN_MODULES = PKIX1Explicit88 PKIX1Implicit88 PKIX1Algorithms88 \
-	PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS5v2-0 OTP-PKIX \
+	PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS-10 PKCS5v2-0 OTP-PKIX \
 	AuthenticationFramework InformationFramework UsefulDefinitions SelectedAttributeTypes
 ASN_ASNS = $(ASN_MODULES:%=%.asn1)
 ASN_ERLS = $(ASN_TOP:%=%.erl)
@@ -120,6 +120,7 @@ PKCS-FRAME.erl PKCS-FRAME.hrl:	        PKCS-FRAME.asn1db
 PKCS-FRAME.asn1db:			PKCS5v2-0.asn1\
 					PKCS-8.asn1\
 					PKCS-7.asn1\
+					PKCS-10.asn1\
 					AuthenticationFramework.asn1\
 					InformationFramework.asn1\
 					UsefulDefinitions.asn1\
diff --git a/lib/public_key/asn1/PKCS-10.asn1 b/lib/public_key/asn1/PKCS-10.asn1
new file mode 100644
index 0000000000..09db4f9460
--- /dev/null
+++ b/lib/public_key/asn1/PKCS-10.asn1
@@ -0,0 +1,67 @@
+PKCS-10 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1)
+pkcs-10(10) modules(1) pkcs-10(1)}
+
+-- $Revision: 1.3 $ --
+
+DEFINITIONS IMPLICIT TAGS ::=
+
+BEGIN
+
+-- EXPORTS All --
+-- All types and values defined in this module are exported for use
+-- in other ASN.1 modules.
+
+IMPORTS
+
+informationFramework, authenticationFramework
+    FROM UsefulDefinitions {joint-iso-itu-t(2) ds(5) module(1)
+    usefulDefinitions(0) 3}
+
+ATTRIBUTE, Name
+    FROM InformationFramework informationFramework
+
+ALGORITHM
+    FROM AuthenticationFramework authenticationFramework;
+
+-- Certificate requests
+
+CertificationRequestInfo ::= SEQUENCE {
+    version       INTEGER { v1(0) } (v1,...),
+    subject       Name,
+    subjectPKInfo SubjectPublicKeyInfo{{ PKInfoAlgorithms }},
+    attributes    [0] Attributes{{ CRIAttributes }}
+}
+
+SubjectPublicKeyInfo {ALGORITHM: IOSet} ::= SEQUENCE {
+    algorithm		AlgorithmIdentifier {{IOSet}},
+    subjectPublicKey 	BIT STRING
+}
+
+PKInfoAlgorithms ALGORITHM ::= {
+    ... -- add any locally defined algorithms here -- }
+
+Attributes { ATTRIBUTE:IOSet } ::= SET OF Attribute{{ IOSet }}
+
+CRIAttributes  ATTRIBUTE  ::= {
+    ... -- add any locally defined attributes here -- }
+
+Attribute { ATTRIBUTE:IOSet } ::= SEQUENCE {
+    type   	ATTRIBUTE.&id({IOSet}),
+    values 	SET SIZE(1..MAX) OF ATTRIBUTE.&Type({IOSet}{@type})
+}
+
+CertificationRequest ::= SEQUENCE {
+    certificationRequestInfo CertificationRequestInfo,
+    signatureAlgorithm	     AlgorithmIdentifier{{ SignatureAlgorithms }},
+    signature                BIT STRING
+}
+
+AlgorithmIdentifier {ALGORITHM:IOSet } ::= SEQUENCE {
+    algorithm  	ALGORITHM.&id({IOSet}),
+    parameters 	ALGORITHM.&Type({IOSet}{@algorithm}) OPTIONAL
+}
+
+SignatureAlgorithms ALGORITHM ::= {
+    ... -- add any locally defined algorithms here -- }
+
+END
+\ No newline at end of file
diff --git a/lib/public_key/asn1/PKCS-FRAME.set.asn b/lib/public_key/asn1/PKCS-FRAME.set.asn
index 343afedd76..64da71509d 100644
--- a/lib/public_key/asn1/PKCS-FRAME.set.asn
+++ b/lib/public_key/asn1/PKCS-FRAME.set.asn
@@ -1,3 +1,4 @@
 PKCS-8.asn1
 PKCS-7.asn1
 PKCS5v2-0.asn1
+PKCS-10.asn1