From fafd888770d16d2a3962210c04a0b341311a13c8 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 7 May 2015 13:59:44 +0200
Subject: public_key: Align types with removal of legacy ASN.1 flags

---
 lib/public_key/doc/src/records.xml          | 20 ++++++++++----------
 lib/public_key/doc/src/using_public_key.xml |  8 +++-----
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/public_key/doc/src/records.xml b/lib/public_key/doc/src/records.xml
index 0090278da8..e9e9b231af 100644
--- a/lib/public_key/doc/src/records.xml
+++ b/lib/public_key/doc/src/records.xml
@@ -160,7 +160,7 @@
     <code>	 
 #'ECPrivateKey'{
           version,       % integer()
-	  privateKey,    % octet_string()  
+	  privateKey,    % binary()  
 	  parameters,    % der_encoded() - {'EcpkParameters', #'ECParameters'{}} |
 	                                   {'EcpkParameters', {namedCurve, oid()}} |
 	                                   {'EcpkParameters', 'NULL'} % Inherited by CA
@@ -171,14 +171,14 @@
       version,    % integer()
       fieldID,    % #'FieldID'{}
       curve,      % #'Curve'{}
-      base,       % octet_string()       
+      base,       % binary()       
       order,      % integer()        
       cofactor    % integer()
       }.
       
 #'Curve'{
-	a,        % octet_string()
-	b,        % octet_string() 
+	a,        % binary()
+	b,        % binary() 
 	seed      % bitstring() - optional
 
 	}.
@@ -189,7 +189,7 @@
 	}.
 
 #'ECPoint'{
-      point %  octet_string() - the public key
+      point %  binary() - the public key
       }.</code>
   </section>
 
@@ -201,7 +201,7 @@
 #'Certificate'{
 		tbsCertificate,        % #'TBSCertificate'{}
 		signatureAlgorithm,    % #'AlgorithmIdentifier'{} 
-		signature              % {0, binary()} - ASN1 compact bitstring
+		signature              % bitstring()
 	       }.
 
 #'TBSCertificate'{
@@ -226,7 +226,7 @@
 #'OTPCertificate'{
 		tbsCertificate,        % #'OTPTBSCertificate'{}
 		signatureAlgorithm,    % #'SignatureAlgorithm'
-		signature              % {0, binary()} - ASN1 compact bitstring
+		signature              % bitstring()
 	       }.
 
 #'OTPTBSCertificate'{
@@ -664,7 +664,7 @@ are as follows:</p>
 #'CertificateList'{
           tbsCertList,        % #'TBSCertList{}
           signatureAlgorithm, % #'AlgorithmIdentifier'{} 
-          signature           % {0, binary()} - ASN1 compact bitstring
+          signature           % bitstring()
 	  }).
 
 #'TBSCertList'{
@@ -796,7 +796,7 @@ are as follows:</p>
 #'CertificationRequest'{
           certificationRequestInfo #'CertificationRequestInfo'{},
 	  signatureAlgorithm	   #'CertificationRequest_signatureAlgorithm'{}}.
-	  signature                {0, binary()} - ASN1 compact bitstring
+	  signature                bitstring()
 	  }
 
 #'CertificationRequestInfo'{
@@ -808,7 +808,7 @@ are as follows:</p>
 
 #'CertificationRequestInfo_subjectPKInfo'{
           algorithm		#'CertificationRequestInfo_subjectPKInfo_algorithm'{}
-	  subjectPublicKey 	 {0, binary()} - ASN1 compact bitstring
+	  subjectPublicKey 	  bitstring()
 	  }
 
 #'CertificationRequestInfo_subjectPKInfo_algorithm'{
diff --git a/lib/public_key/doc/src/using_public_key.xml b/lib/public_key/doc/src/using_public_key.xml
index aaf802cd34..41a81b6dea 100644
--- a/lib/public_key/doc/src/using_public_key.xml
+++ b/lib/public_key/doc/src/using_public_key.xml
@@ -212,9 +212,8 @@
             algorithm = {1,2,840,113549,1,1,5},
             parameters = &lt;&lt;5,0&gt;&gt;},
     signature =
-        {0,
-         &lt;&lt;163,186,7,163,216,152,63,47,154,234,139,73,154,96,120,
-           165,2,52,196,195,109,167,192,...&gt;&gt;}}</code>
+    &lt;&lt;163,186,7,163,216,152,63,47,154,234,139,73,154,96,120,
+    165,2,52,196,195,109,167,192,...&gt;&gt;}</code>
 
       <p>Parts of certificates can be decoded with
       <c>public_key:der_decode/2</c>, using the ASN.1 type of that part.
@@ -317,9 +316,8 @@
             algorithm = {1,2,840,113549,1,1,5},
             parameters = 'NULL'},
     signature =
-        {0,
          &lt;&lt;163,186,7,163,216,152,63,47,154,234,139,73,154,96,120,
-           165,2,52,196,195,109,167,192,...&gt;&gt;}}</code>
+           165,2,52,196,195,109,167,192,...&gt;&gt;}</code>
 
       <p>This call is equivalent to <c>public_key:pem_entry_decode(CertEntry1)</c>:</p>
       <code>5> public_key:pkix_decode_cert(DerCert, plain).
-- 
cgit v1.2.3