Merge branch 'ia/public_key/ssl/crypto/PKCS-8/OTP-9312'

* ia/public_key/ssl/crypto/PKCS-8/OTP-9312:
  Add clause for expected input to pubkey:pseudo_random_function/2 when ASN-1 compiler is fixed.
  Clean up of public_key code adding specs and documentation
  Added PKCS-8 support in ssl
  Additions to crypto and public_key needed for full PKCS-8 support
  Add PKCS-8 support to public_key

1 files changed, 28 insertions, 2 deletions

diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 824be09438..48243fd693 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -334,14 +334,16 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
     </func>
     <func>
       <name>sha_mac(Key, Data) -> Mac</name>
+      <name>sha_mac(Key, Data, MacLength) -> Mac</name>
       <fsummary>Compute an <c>MD5 MAC</c>message authentification code</fsummary>
       <type>
         <v>Key = Data = iolist() | binary()</v>
         <v>Mac = binary()</v>
+	<v>MacLenength = integer() =&lt; 20 </v>
       </type>
       <desc>
         <p>Computes an <c>SHA MAC</c> message authentification code
-          from <c>Key</c> and <c>Data</c>, where the length of the Mac
+          from <c>Key</c> and <c>Data</c>, where the default length of the Mac
           is 160 bits (20 bytes).</p>
       </desc>
     </func>
@@ -1046,6 +1048,30 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
     </func>
 
     <func>
+      <name>rc2_cbc_encrypt(Key, IVec, Text) -> Cipher</name>
+      <fsummary>Encrypt <c>Text</c>according to RC2 in CBC mode</fsummary>
+      <type>
+        <v>Key = Text = iolist() | binary()</v>
+        <v>Ivec = Cipher = binary()</v>
+      </type>
+      <desc>
+        <p>Encrypts <c>Text</c> according to RC2 in CBC mode.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>rc2_cbc_decrypt(Key, IVec, Cipher) -> Text</name>
+      <fsummary>Decrypts <c>Cipher</c>according to RC2 in CBC mode</fsummary>
+      <type>
+        <v>Key = Text = iolist() | binary()</v>
+        <v>Ivec = Cipher = binary()</v>
+      </type>
+      <desc>
+        <p>Decrypts <c>Cipher</c> according to RC2 in CBC mode.</p>
+      </desc>
+    </func>
+    
+    <func>
       <name>rc4_encrypt(Key, Data) -> Result</name>
       <fsummary>Encrypt data using RC4</fsummary>
       <type>