From 5045abb2e92f9370b05f5e9c6f116fb01bf9e4fe Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 30 Aug 2020 11:46:45 +0200 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/12587) --- test/evp_test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/evp_test.c b/test/evp_test.c index d5ec08c469..52e1dd2e51 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -3268,7 +3268,8 @@ static int key_unsupported(void) * disabled). */ if (ERR_GET_LIB(err) == ERR_LIB_EC - && ERR_GET_REASON(err) == EC_R_UNKNOWN_GROUP) { + && (ERR_GET_REASON(err) == EC_R_UNKNOWN_GROUP + || ERR_GET_REASON(err) == EC_R_INVALID_CURVE)) { ERR_clear_error(); return 1; } -- cgit v1.2.3