Merge branch 'ia/public_key/Additional-PKCS-support/OTP-10509' into maint

* ia/public_key/Additional-PKCS-support/OTP-10509:
  Prepare for release
  public_key: Add PKCS-10 documentation and PKCS-7 test case
  public_key: Simplified PKCS-7 and PKCS-10 specs.
  public_key: Added PKCS-10
  public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS.
  public_key: Add PKCS-7

1 files changed, 40 insertions, 3 deletions

diff --git a/lib/public_key/doc/src/cert_records.xml b/lib/public_key/doc/src/cert_records.xml
index ad4f5812cb..edef664245 100644
--- a/lib/public_key/doc/src/cert_records.xml
+++ b/lib/public_key/doc/src/cert_records.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -37,7 +37,10 @@
   <p>This chapter briefly describes erlang records derived from asn1
   specifications used to handle X509 certificates. The intent is to
   describe the data types and not to specify the meaning of each
-  component for this we refer you to RFC 5280.
+  component for this we refer you to <url
+  href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280</url>. Also
+  descirbed is <p>CertificationRequest</p> that is defined by <url
+  href=http://www.rsa.com/rsalabs/node.asp?id=2124">PKCS-10</url>.
   </p>
 
   <p>Use the following include directive to get access to the
@@ -630,6 +633,40 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
 	 aACompromise        
        </c></p>
  </section>
- 
+
+ <section>
+   <marker id="PKCS10"></marker>
+   <title>PKCS#10 Certification Request</title>
+   <code>
+#'CertificationRequest'{
+          certificationRequestInfo #'CertificationRequestInfo'{},
+	  signatureAlgorithm	   #'CertificationRequest_signatureAlgorithm'{}}.
+	  signature                {0, binary()} - asn1 compact bitstring
+	  }
+
+#'CertificationRequestInfo'{
+	  version       atom(),
+	  subject       {rdnSequence, [#AttributeTypeAndValue'{}]} ,
+	  subjectPKInfo #'CertificationRequestInfo_subjectPKInfo'{},
+	  attributes    [#AttributeTypeAndValue'{}]
+	  }
+
+#'CertificationRequestInfo_subjectPKInfo'{
+          algorithm		#'CertificationRequestInfo_subjectPKInfo_algorithm'{}
+	  subjectPublicKey 	 {0, binary()} - asn1 compact bitstring
+	  }
+
+#'CertificationRequestInfo_subjectPKInfo_algorithm'{
+     algorithm = oid(),
+     parameters = asn1_der_encoded()
+}	  
+
+#'CertificationRequest_signatureAlgorithm'{
+     algorithm = oid(),
+     parameters = asn1_der_encoded()
+     }  
+   </code> 
+ </section>
+
 </section>
 </chapter>