diff options
| author | Sverker Eriksson <[email protected]> | 2015-05-25 11:45:05 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-05-25 11:45:05 +0200 |
| commit | 2d8a73e2099f239e75276680cda9914c852316ee (patch) | |
| tree | 2cfcb1a5fdf704a0c6f0c7b19601ddfd87b07b64 | |
| parent | c12d2dc802df9510ae32ac37ccefeb162767774c (diff) | |
| parent | 03f771ed570840a25eddc5e93b511e9cfdfe311e (diff) | |
| download | otp-2d8a73e2099f239e75276680cda9914c852316ee.tar.gz otp-2d8a73e2099f239e75276680cda9914c852316ee.tar.bz2 otp-2d8a73e2099f239e75276680cda9914c852316ee.zip | |
Merge branch 'sverk/crypto/ec_key_generate/OTP-12733'
* sverk/crypto/ec_key_generate/OTP-12733:
crypto: Change eliptic curve test from 'sect113r2' to 'secp112r2'
| -rw-r--r-- | lib/crypto/test/crypto_SUITE.erl | 5 | ||||
| -rw-r--r-- | lib/crypto/test/old_crypto_SUITE.erl | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl index 72944eea8e..ff7af1f2c1 100644 --- a/lib/crypto/test/crypto_SUITE.erl +++ b/lib/crypto/test/crypto_SUITE.erl @@ -1884,8 +1884,9 @@ dss_params() -> 18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669]. ec_key_named() -> - {D2_pub, D2_priv} = crypto:generate_key(ecdh, sect113r2), - {[D2_priv, sect113r2], [D2_pub, sect113r2]}. + Curve = secp112r2, + {D2_pub, D2_priv} = crypto:generate_key(ecdh, Curve), + {[D2_priv, Curve], [D2_pub, Curve]}. ec_msg() -> <<99,234,6,64,190,237,201,99,80,248,58,40,70,45,149,218,5,246,242,63>>. diff --git a/lib/crypto/test/old_crypto_SUITE.erl b/lib/crypto/test/old_crypto_SUITE.erl index 040edbf092..80306927c5 100644 --- a/lib/crypto/test/old_crypto_SUITE.erl +++ b/lib/crypto/test/old_crypto_SUITE.erl @@ -1887,9 +1887,9 @@ ec(Config) when is_list(Config) -> ec_do() -> %% test for a name curve - {D2_pub, D2_priv} = crypto:generate_key(ecdh, sect113r2), - PrivECDH = [D2_priv, sect113r2], - PubECDH = [D2_pub, sect113r2], + {D2_pub, D2_priv} = crypto:generate_key(ecdh, secp112r2), + PrivECDH = [D2_priv, secp112r2], + PubECDH = [D2_pub, secp112r2], %%TODO: find a published test case for a EC key %% test for a full specified curve and public key, |