aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/c_src/crypto.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-02-08 18:45:54 +0100
committerSverker Eriksson <[email protected]>2016-02-08 18:45:54 +0100
commit3c56cb7a4c3bcb8a089c0b83375aad46c010a9b7 (patch)
tree527bfa03df4b09fdbf5d4c0ab47fd463b77551db /lib/crypto/c_src/crypto.c
parent1430a673d453ab330a93930719c41a2e786c948f (diff)
parent62ad9fb02820b7563402702e6026d9f4213149c6 (diff)
downloadotp-3c56cb7a4c3bcb8a089c0b83375aad46c010a9b7.tar.gz
otp-3c56cb7a4c3bcb8a089c0b83375aad46c010a9b7.tar.bz2
otp-3c56cb7a4c3bcb8a089c0b83375aad46c010a9b7.zip
Merge branch 'sverk/ecc-fixes' into maint
OTP-13311 * sverk/ecc-fixes: Ensure testing ssl with supported ciphers only Only use supported EC curves in crypto tests Check the result of EC_GROUP_new_curve_* calls
Diffstat (limited to 'lib/crypto/c_src/crypto.c')
-rw-r--r--lib/crypto/c_src/crypto.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 3c73c318ed..4966701e41 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -3569,6 +3569,9 @@ static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
} else
goto out_err;
+ if (!group)
+ goto out_err;
+
if (enif_inspect_binary(env, prime[2], &seed)) {
EC_GROUP_set_seed(group, seed.data, seed.size);
}