diff options
| author | Bruce Yinhe <[email protected]> | 2015-01-12 10:08:40 +0100 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2015-01-12 10:08:40 +0100 |
| commit | 71b35f78c12f31ae33cf51fd948c22483c77ff7c (patch) | |
| tree | f487778160b2866e188b6af973c9cb73b1df545d /lib/crypto/src/crypto.erl | |
| parent | f8c523df5caf97d5c46e9ad7b5008161b36f2c8d (diff) | |
| parent | 08753545c4b08b191234f60efe65f78ed113f0d2 (diff) | |
| download | otp-71b35f78c12f31ae33cf51fd948c22483c77ff7c.tar.gz otp-71b35f78c12f31ae33cf51fd948c22483c77ff7c.tar.bz2 otp-71b35f78c12f31ae33cf51fd948c22483c77ff7c.zip | |
Merge branch 'RoadRunnr/crypto-ecc-gen-key'
OTP-12394
* RoadRunnr/crypto-ecc-gen-key:
[crypto] enhance generate_key for ECC keys
Diffstat (limited to 'lib/crypto/src/crypto.erl')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index 7f82fa83fd..92da8efba4 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -588,9 +588,8 @@ generate_key(srp, {user, [Generator, Prime, Version]}, PrivateArg) end, user_srp_gen_key(Private, Generator, Prime); -generate_key(ecdh, Curve, undefined) -> - ec_key_generate(nif_curve_params(Curve)). - +generate_key(ecdh, Curve, PrivKey) -> + ec_key_generate(nif_curve_params(Curve), ensure_int_as_bin(PrivKey)). compute_key(dh, OthersPublicKey, MyPrivateKey, DHParameters) -> case dh_compute_key_nif(ensure_int_as_bin(OthersPublicKey), @@ -1555,7 +1554,7 @@ dh_compute_key(OthersPublicKey, MyPrivateKey, DHParameters) -> dh_compute_key_nif(_OthersPublicKey, _MyPrivateKey, _DHParameters) -> ?nif_stub. -ec_key_generate(_Key) -> ?nif_stub. +ec_key_generate(_Curve, _Key) -> ?nif_stub. ecdh_compute_key_nif(_Others, _Curve, _My) -> ?nif_stub. |