File 1631-crypto-Re-phrase-leagacy-code-and-comments... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1631-crypto-Re-phrase-leagacy-code-and-comments.patch of Package erlang (Revision 740810ae07adffc1a50bb3a32135aa98)

Currently displaying revision 740810ae07adffc1a50bb3a32135aa98 , Show latest

From dd1077f48009a94463000bb98818dd5cdbc86a5c Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 11 May 2020 09:48:08 +0200
Subject: [PATCH 01/17] crypto: Re-phrase leagacy code and comments

---
 lib/crypto/src/crypto.erl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 473be885c9..2646abbf86 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -1560,13 +1560,14 @@ generate_key(rsa, {ModulusSize, PublicExponent}, undefined) ->
             {lists:sublist(Private, 2), Private}
     end;
 
-generate_key(eddh, Curve, PrivKey) when Curve == x448 ;
-                                        Curve == x25519 ->
-    evp_generate_key_nif(Curve, ensure_int_as_bin(PrivKey));
 generate_key(ecdh, Curve, PrivKey) when Curve == x448 ;
                                         Curve == x25519 ->
-    %% This was here before the eddh was added as an own Type
+    %% Legacy: This clause was here before the eddh was added as an own Type
+    generate_key(eddh, Curve, PrivKey);
+generate_key(eddh, Curve, PrivKey) when Curve == x448 ;
+                                        Curve == x25519 ->
     evp_generate_key_nif(Curve, ensure_int_as_bin(PrivKey));
+
 generate_key(ecdh, Curve, PrivKey) ->
     ec_key_generate(nif_curve_params(Curve), ensure_int_as_bin(PrivKey));
 
@@ -1627,7 +1628,8 @@ compute_key(srp, UserPublic, {HostPublic, HostPrivate},
 
 compute_key(ecdh, Others, My, Curve) when Curve == x448 ;
                                           Curve == x25519 ->
-    evp_compute_key_nif(Curve, ensure_int_as_bin(Others), ensure_int_as_bin(My));
+    %% Legacy: This clause was here before the eddh was added as an own Type
+    compute_key(eddh, Others, My, Curve);
 
 compute_key(eddh, Others, My, Curve) when Curve == x448 ;
                                           Curve == x25519 ->
-- 
2.31.1

Places

File 1631-crypto-Re-phrase-leagacy-code-and-comments.patch of Package erlang (Revision 740810ae07adffc1a50bb3a32135aa98)

Places