diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/ec/ec_ameth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c index 78580024e0..38d5a0d1e1 100644 --- a/src/lib/libcrypto/ec/ec_ameth.c +++ b/src/lib/libcrypto/ec/ec_ameth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_ameth.c,v 1.57 2024/04/17 13:51:41 tb Exp $ */ | 1 | /* $OpenBSD: ec_ameth.c,v 1.58 2024/04/17 13:54:39 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -930,9 +930,8 @@ ecdh_cms_encrypt(CMS_RecipientInfo *ri) | |||
930 | if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &talg, &pubkey, | 930 | if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &talg, &pubkey, |
931 | NULL, NULL, NULL)) | 931 | NULL, NULL, NULL)) |
932 | goto err; | 932 | goto err; |
933 | X509_ALGOR_get0(&aoid, NULL, NULL, talg); | ||
934 | 933 | ||
935 | /* Is everything uninitialised? */ | 934 | X509_ALGOR_get0(&aoid, NULL, NULL, talg); |
936 | if (aoid == OBJ_nid2obj(NID_undef)) { | 935 | if (aoid == OBJ_nid2obj(NID_undef)) { |
937 | EVP_PKEY *pkey; | 936 | EVP_PKEY *pkey; |
938 | 937 | ||
@@ -949,8 +948,9 @@ ecdh_cms_encrypt(CMS_RecipientInfo *ri) | |||
949 | if (!asn1_abs_set_unused_bits(pubkey, 0)) | 948 | if (!asn1_abs_set_unused_bits(pubkey, 0)) |
950 | goto err; | 949 | goto err; |
951 | 950 | ||
952 | X509_ALGOR_set0(talg, OBJ_nid2obj(NID_X9_62_id_ecPublicKey), | 951 | if (!X509_ALGOR_set0_by_nid(talg, NID_X9_62_id_ecPublicKey, |
953 | V_ASN1_UNDEF, NULL); | 952 | V_ASN1_UNDEF, NULL)) |
953 | goto err; | ||
954 | } | 954 | } |
955 | 955 | ||
956 | /* See if custom parameters set */ | 956 | /* See if custom parameters set */ |