diff options
author | Richard Levitte <levitte@openssl.org> | 2020-08-30 11:46:45 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-09-03 17:48:33 +0200 |
commit | 5045abb2e92f9370b05f5e9c6f116fb01bf9e4fe (patch) | |
tree | bf1e9ef2d288e9f05e841f84651487497afc84a4 /crypto/ec | |
parent | 7192e4dfa104f83e54c37e6acfa49fb6a3e1a5dd (diff) |
EC: Remove one error record that shadows another
In EC_GROUP_new_from_params(), ERR_R_EC_LIB was reported if
group_new_from_name() returned NULL. However, this shadows a possible
EC_R_INVALID_CURVE, making that harder to detect, which happens to be
important to do in test/evp_test.c.
This also extends key_unsupported() in test/evp_test.c to check for
this error alongside the check for EC_R_UNKNOWN_GROUP.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12587)
Diffstat (limited to 'crypto/ec')
-rw-r--r-- | crypto/ec/ec_lib.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index d9298f62d0..d7752e953f 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -1552,8 +1552,6 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[], group = group_new_from_name(ptmp, libctx, propq); if (group != NULL) EC_GROUP_set_asn1_flag(group, encoding_flag); - else - ECerr(0, ERR_R_EC_LIB); return group; } bnctx = BN_CTX_new_ex(libctx); |