Merge branch 'maint-r14' of super:otp into maint-r14

1 files changed, 85 insertions, 37 deletions

diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 81aedaea56..d60d91cd83 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -43,7 +43,7 @@
     
     <note><p>All records used in this manual 
     <!--     except #policy_tree_node{}  -->
-    are generated from asn1 specifications
+    are generated from ASN.1 specifications
     and are documented in the User's Guide. See <seealso 
     marker="public_key_records">Public key records</seealso> and <seealso 
     marker="cert_records">X.509 Certificate records</seealso>. 
@@ -56,44 +56,43 @@
 
     <p><em>Data Types </em></p> 
     
-    <p><c>boolean() = true | false</c></p> 
+    <p><code>boolean() = true | false</code></p>
 
-    <p><c>string = [bytes()]</c></p>
+    <p><code>string = [bytes()]</code></p>
    
-    <p><c>der_encoded() = binary() </c></p>
-
-    <p><c>decrypt_der() = binary() </c></p>
+    <p><code>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey'
+    'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'</code></p>
     
-    <p><c>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey'
-    'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'</c></p>
-
-     <p><c>pem_entry () = {pki_asn1_type(), der_encoded() | decrypt_der(), not_encrypted |
-     {"DES-CBC" | "DES-EDE3-CBC",  crypto:rand_bytes(8)}}.</c></p>
-     
-    <p><c>rsa_public_key()  = #'RSAPublicKey'{}</c></p> 
+    <p><code>pem_entry () = {pki_asn1_type(), binary() %% DER or encrypted DER
+          not_encrypted | {"DES-CBC" | "DES-EDE3-CBC",  crypto:rand_bytes(8)}}.</code></p>
     
-    <p><c>rsa_private_key() = #'RSAPrivateKey'{} </c></p>
+    <p><code>rsa_public_key()  = #'RSAPublicKey'{}</code></p>
+
+    <p><code>rsa_private_key() = #'RSAPrivateKey'{} </code></p>
 
-    <p><c>dsa_public_key() = {integer(),  #'Dss-Parms'{}} </c></p> 
+    <p><code>dsa_public_key() = {integer(),  #'Dss-Parms'{}} </code></p>
 
-    <p><c>rsa_private_key() = #'RSAPrivateKey'{} </c></p> 
+    <p><code>rsa_private_key() = #'RSAPrivateKey'{} </code></p>
     
-    <p><c>dsa_private_key() = #'DSAPrivateKey'{}</c></p>
+    <p><code>dsa_private_key() = #'DSAPrivateKey'{}</code></p>
     
-    <p><c> public_crypt_options() = [{rsa_pad, rsa_padding()}]. </c></p>
+    <p><code> public_crypt_options() = [{rsa_pad, rsa_padding()}]. </code></p>
 
-    <p><c> rsa_padding() =  'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' 
-    | 'rsa_no_padding'</c></p>
+    <p><code> rsa_padding() =  'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding'
+    | 'rsa_no_padding'</code></p>
     
-    <p><c> rsa_digest_type()  = 'md5' | 'sha' </c></p>
-    
-    <p><c> dss_digest_type()  = 'none' | 'sha' </c></p>
+    <p><code> rsa_digest_type()  = 'md5' | 'sha' </code></p>
+
+    <p><code> dss_digest_type()  = 'none' | 'sha' </code></p>
+
+    <p><code> ssh_file()  = openssh_public_key | rfc4716_public_key |
+    known_hosts | auth_keys </code></p>
     
-<!--     <p><c>policy_tree() = [Root, Children]</c></p> -->
+<!--     <p><code>policy_tree() = [Root, Children]</code></p> -->
     
-<!--     <p><c>Root = #policy_tree_node{}</c></p>    -->
+<!--     <p><code>Root = #policy_tree_node{}</code></p>    -->
 
-<!--     <p><c>Children = [] | policy_tree()</c></p> -->
+<!--     <p><code>Children = [] | policy_tree()</code></p> -->
 	
 <!--     <p> The policy_tree_node record has the following fields:</p> -->
     
@@ -151,12 +150,12 @@
     <fsummary> Decodes a public key asn1 der encoded entity.</fsummary>
     <type>
       <v>Asn1Type = atom() -</v>
-      <d> Asn1 type present in the public_key applications
+      <d> ASN.1 type present in the public_key applications
       asn1 specifications.</d>
       <v>Der = der_encoded()</v>
     </type> 
     <desc> 
-      <p> Decodes a public key asn1 der encoded entity.</p> 
+      <p> Decodes a public key ASN.1 der encoded entity.</p>
     </desc> 
   </func>
     
@@ -166,25 +165,25 @@
     <type>
       <v>Asn1Type = atom()</v>
       <d> Asn1 type present in the public_key applications
-	 asn1 specifications.</d>
+	 ASN.1 specifications.</d>
       <v>Entity = term() - The erlang representation of <c> Asn1Type</c></v>
   </type> 
   <desc> 
-    <p> Encodes a public key entity with asn1 DER encoding.</p> 
+    <p> Encodes a public key entity with ASN.1 DER encoding.</p>
   </desc> 
   </func>
 
   <func>
     <name>pem_decode(PemBin) -> [pem_entry()]</name>
     <fsummary>Decode PEM binary data and return
-    entries as asn1 der encoded entities. </fsummary>
+    entries as ASN.1 der encoded entities. </fsummary>
     <type>
       <v>PemBin = binary()</v>
       <d>Example {ok, PemBin} = file:read_file("cert.pem").</d>
     </type> 
   <desc> 
     <p>Decode PEM binary data and return
-    entries as asn1 der encoded entities.</p> 
+    entries as ASN.1 der encoded entities.</p>
   </desc> 
   </func> 
     
@@ -259,13 +258,13 @@
   
   <func>
     <name>pkix_decode_cert(Cert, otp|plain) ->  #'Certificate'{} | #'OTPCertificate'{}</name>
-    <fsummary> Decodes an asn1 der encoded pkix x509 certificate.</fsummary>
+    <fsummary> Decodes an ASN.1 der encoded pkix x509 certificate.</fsummary>
     <type>
       <v>Cert = der_encoded()</v> 
   </type> 
   <desc> 
-    <p>Decodes an asn1 der encoded pkix certificate.  The otp option
-    will use the customized asn1 specification OTP-PKIX.asn1 for
+    <p>Decodes an ASN.1 der encoded pkix certificate.  The otp option
+    will use the customized ASN.1 specification OTP-PKIX.asn1 for
     decoding and also recursively decode most of the standard
     parts.</p>
   </desc> 
@@ -277,7 +276,7 @@
     certificate.</fsummary>
     <type>
       <v>Asn1Type = atom()</v>
-      <d>The asn1 type can be 'Certificate', 'OTPCertificate' or a subtype of either .</d>
+      <d>The ASN.1 type can be 'Certificate', 'OTPCertificate' or a subtype of either .</d>
   </type> 
   <desc> 
     <p>Der encodes a pkix x509 certificate or part of such a
@@ -395,7 +394,7 @@
        signed or in the case that digest type is <c>none</c>
        it is the hashed value of "plain text" i.e. the digest.</d>
        <v>DigestType = rsa_digest_type() | dsa_digest_type()</v>
-       <v>Key = rsa_public_key() | dsa_public_key()</v> 
+       <v>Key = rsa_private_key() | dsa_private_key()</v>
   </type> 
   <desc> 
     <p> Creates a digital signature.</p> 
@@ -403,6 +402,55 @@
   </func>   
 
   <func>
+    <name>ssh_decode(SshBin,  Type) -> [{public_key(), Attributes::list()}]</name>
+    <fsummary>Decodes a ssh file-binary. </fsummary>
+    <type>
+      <v>SshBin = binary()</v>
+      <d>Example {ok, SshBin} = file:read_file("known_hosts").</d>
+      <v> Type = public_key | ssh_file()</v>
+      <d>If <c>Type</c> is <c>public_key</c> the binary may be either
+      a rfc4716 public key or a openssh public key.</d>
+    </type>
+  <desc>
+    <p> Decodes a ssh file-binary. In the case of know_hosts or
+    auth_keys the binary may include one or more lines of the
+    file. Returns a list of public keys and their attributes, possible
+    attribute values depends on the file type represented by the
+    binary.
+    </p>
+
+    <taglist>
+      <tag>rfc4716 attributes - see RFC 4716</tag>
+      <item>{headers, [{string(), utf8_string()}]}</item>
+      <tag>auth_key attributes - see man sshd </tag>
+      <item>{comment, string()}</item>
+      <item>{options, [string()]}</item>
+      <item>{bits, integer()} - In ssh version 1 files</item>
+      <tag>known_host attributes - see man sshd</tag>
+      <item>{hostnames, [string()]}</item>
+      <item>{comment, string()}</item>
+      <item>{bits, integer()} - In ssh version 1 files</item>
+    </taglist>
+
+  </desc>
+  </func>
+
+  <func>
+    <name>ssh_encode([{Key, Attributes}], Type) -> binary()</name>
+    <fsummary> Encodes a list of ssh file entries to a binary.</fsummary>
+    <type>
+      <v>Key = public_key()</v>
+      <v>Attributes = list()</v>
+      <v>Type = ssh_file()</v>
+    </type>
+  <desc>
+    <p>Encodes a list of ssh file entries (public keys and attributes) to a binary. Possible
+    attributes depends on the file type, see <seealso
+    marker="ssh_decode"> ssh_decode/2 </seealso></p>
+  </desc>
+  </func>
+
+  <func>
     <name>verify(Msg, DigestType, Signature, Key) -> boolean()</name>
     <fsummary>Verifies a digital signature.</fsummary>
     <type>