diff options
| author | Hans Nilsson <[email protected]> | 2017-01-31 16:51:54 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-01-31 16:51:54 +0100 |
| commit | 21d21786abdaae2ae0a601baf5102412399d7af6 (patch) | |
| tree | 1a684c0395ee28b6911e605d80913dbed44cf36f /lib/crypto/src | |
| parent | 82c885e37f5886da35ae1ba0338702c89df75623 (diff) | |
| parent | 80a162cdf59f6a3826fba0cc0d3b861451a6b102 (diff) | |
| download | otp-21d21786abdaae2ae0a601baf5102412399d7af6.tar.gz otp-21d21786abdaae2ae0a601baf5102412399d7af6.tar.bz2 otp-21d21786abdaae2ae0a601baf5102412399d7af6.zip | |
Merge branch 'hans/ssh/speed_dh_keygen/OTP-14169' into maint
Diffstat (limited to 'lib/crypto/src')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index a87b480f60..deeb763145 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -547,9 +547,15 @@ exor(Bin1, Bin2) -> generate_key(Type, Params) -> generate_key(Type, Params, undefined). -generate_key(dh, DHParameters, PrivateKey) -> +generate_key(dh, DHParameters0, PrivateKey) -> + {DHParameters, Len} = + case DHParameters0 of + [P,G,L] -> {[P,G], L}; + [P,G] -> {[P,G], 0} + end, dh_generate_key_nif(ensure_int_as_bin(PrivateKey), - map_ensure_int_as_bin(DHParameters), 0); + map_ensure_int_as_bin(DHParameters), + 0, Len); generate_key(srp, {host, [Verifier, Generator, Prime, Version]}, PrivArg) when is_binary(Verifier), is_binary(Generator), is_binary(Prime), is_atom(Version) -> @@ -1201,11 +1207,11 @@ dh_check([_Prime,_Gen]) -> ?nif_stub. {binary(),binary()}. dh_generate_key(DHParameters) -> - dh_generate_key_nif(undefined, map_mpint_to_bin(DHParameters), 4). + dh_generate_key_nif(undefined, map_mpint_to_bin(DHParameters), 4, 0). dh_generate_key(PrivateKey, DHParameters) -> - dh_generate_key_nif(mpint_to_bin(PrivateKey), map_mpint_to_bin(DHParameters), 4). + dh_generate_key_nif(mpint_to_bin(PrivateKey), map_mpint_to_bin(DHParameters), 4, 0). -dh_generate_key_nif(_PrivateKey, _DHParameters, _Mpint) -> ?nif_stub. +dh_generate_key_nif(_PrivateKey, _DHParameters, _Mpint, _Length) -> ?nif_stub. %% DHParameters = [P (Prime)= mpint(), G(Generator) = mpint()] %% MyPrivKey, OthersPublicKey = mpint() |