diff options
author | tb <> | 2024-10-11 18:35:39 +0000 |
---|---|---|
committer | tb <> | 2024-10-11 18:35:39 +0000 |
commit | 116457c99e8e4e7a290250ddda7975371326557e (patch) | |
tree | 0dc9005652188b8be7c8ab333777c436667f812a /src | |
parent | 0d3914979e2bded1fd7ab4d9d4a0d94da715eb69 (diff) | |
download | openbsd-116457c99e8e4e7a290250ddda7975371326557e.tar.gz openbsd-116457c99e8e4e7a290250ddda7975371326557e.tar.bz2 openbsd-116457c99e8e4e7a290250ddda7975371326557e.zip |
Fix a long-standing bug in ec_asn1_group2pkparameters()
Only check for the OPENSSL_EC_NAMED_CURVE being set to treat the curve
parameters as named curve parameters.
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c index c27257bdbb..3cc91fe4c1 100644 --- a/src/lib/libcrypto/ec/ec_asn1.c +++ b/src/lib/libcrypto/ec/ec_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_asn1.c,v 1.65 2024/10/11 18:34:20 tb Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.66 2024/10/11 18:35:39 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -803,7 +803,7 @@ ec_asn1_group2pkparameters(const EC_GROUP *group) | |||
803 | goto err; | 803 | goto err; |
804 | } | 804 | } |
805 | 805 | ||
806 | if (EC_GROUP_get_asn1_flag(group) != 0) { | 806 | if ((EC_GROUP_get_asn1_flag(group) & OPENSSL_EC_NAMED_CURVE) != 0) { |
807 | if ((nid = EC_GROUP_get_curve_name(group)) == NID_undef) | 807 | if ((nid = EC_GROUP_get_curve_name(group)) == NID_undef) |
808 | goto err; | 808 | goto err; |
809 | if ((aobj = OBJ_nid2obj(nid)) == NULL) | 809 | if ((aobj = OBJ_nid2obj(nid)) == NULL) |