From 82a435ca0f91782ebd39b237d56426277ffeda80 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 7 Jun 2013 14:22:18 +0200
Subject: ssl: Correct rebase mistakes

---
 lib/public_key/src/public_key.erl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/public_key')

diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 3eea6f6ec4..cdbfe6e07c 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -252,8 +252,7 @@ decrypt_private(CipherText, Key) ->
     decrypt_private(CipherText, Key, []).
 
 decrypt_private(CipherText,
-		#'RSAPrivateKey'{modulus = N, publicExponent = E,
-				 privateExponent = D} = Key,
+		#'RSAPrivateKey'{} = Key,
 		Options)
   when is_binary(CipherText),
        is_list(Options) ->
-- 
cgit v1.2.3


From 557151814b33cb3ed6c245e27f3b80e24284f19e Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 5 Jun 2013 18:02:34 +0200
Subject: crypto & public_key: Clearify documentation.

---
 lib/public_key/doc/src/public_key.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'lib/public_key')

diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 10c95a39ac..c8236b94ca 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -154,8 +154,8 @@
 <funcs>    
 
   <func>
-    <name> compute_key(OthersKey, MyKey)-></name>
-    <name> compute_key(OthersKey, MyKey, Params)-></name>
+    <name>compute_key(OthersKey, MyKey)-></name>
+    <name>compute_key(OthersKey, MyKey, Params)-></name>
     <fsummary> Compute shared secret</fsummary>
     <type>
       <v>OthersKey = #'ECPoint'{} | binary(), MyKey = #'ECPrivateKey'{} | binary()</v>
@@ -176,7 +176,8 @@
       <v>Options = public_crypt_options()</v>
   </type> 
   <desc> 
-    <p>Public key decryption using the private key.</p> 
+    <p>Public key decryption using the private key. See also <seealso
+	marker="crypto:crypto#private_decrypt/4">crypto:private_decrypt/4</seealso></p> 
   </desc> 
   </func>
 
@@ -190,7 +191,8 @@
       <v>Options = public_crypt_options()</v>
   </type> 
   <desc> 
-    <p> Public key decryption using the public key.</p> 
+    <p> Public key decryption using the public key. See also <seealso
+	marker="crypto:crypto#public_decrypt/4">crypto:public_decrypt/4</seealso></p> 
   </desc> 
   </func> 
 
@@ -304,7 +306,9 @@
       <v>Key = rsa_private_key()</v> 
   </type> 
   <desc> 
-    <p> Public key encryption using the private key.</p> 
+    <p> Public key encryption using the private key.
+     See also <seealso
+	marker="crypto:crypto#private_encrypt/4">crypto:private_encrypt/4</seealso></p> 
   </desc> 
   </func>   
 
@@ -316,7 +320,8 @@
       <v>Key = rsa_public_key()</v> 
   </type> 
   <desc> 
-    <p> Public key encryption using the public key.</p> 
+    <p> Public key encryption using the public key.  See also <seealso
+	marker="crypto:crypto#public_encrypt/4">crypto:public_encrypt/4</seealso></p> 
   </desc> 
   </func>   
   
-- 
cgit v1.2.3