diff options
| author | tb <> | 2024-04-17 13:47:18 +0000 |
|---|---|---|
| committer | tb <> | 2024-04-17 13:47:18 +0000 |
| commit | ffae08269e45e016cb8157b48ea1a075eccf392c (patch) | |
| tree | 61a30a0dc78b373cfd1193d021fab40a067f2835 | |
| parent | 9081df50fd54559141cf8c71929ca001ed031abc (diff) | |
| download | openbsd-ffae08269e45e016cb8157b48ea1a075eccf392c.tar.gz openbsd-ffae08269e45e016cb8157b48ea1a075eccf392c.tar.bz2 openbsd-ffae08269e45e016cb8157b48ea1a075eccf392c.zip | |
Fix error check in ecdh_cms_encrypt()
ASN1_TYPE_get() returns V_ASN1_* constants. Checking the return for
NID_undef instead means that we actually check for V_ASN1_EOC, which
makes absolutely no sense here. Clearly V_ASN1_UNDEF was intended.
ok jsing
| -rw-r--r-- | src/lib/libcrypto/ec/ec_ameth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c index a73add0c24..739297346c 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.53 2024/04/14 15:41:09 tb Exp $ */ | 1 | /* $OpenBSD: ec_ameth.c,v 1.54 2024/04/17 13:47:18 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 | */ |
| @@ -1013,7 +1013,7 @@ ecdh_cms_encrypt(CMS_RecipientInfo *ri) | |||
| 1013 | goto err; | 1013 | goto err; |
| 1014 | if (EVP_CIPHER_param_to_asn1(ctx, wrap_alg->parameter) <= 0) | 1014 | if (EVP_CIPHER_param_to_asn1(ctx, wrap_alg->parameter) <= 0) |
| 1015 | goto err; | 1015 | goto err; |
| 1016 | if (ASN1_TYPE_get(wrap_alg->parameter) == NID_undef) { | 1016 | if (ASN1_TYPE_get(wrap_alg->parameter) == V_ASN1_UNDEF) { |
| 1017 | ASN1_TYPE_free(wrap_alg->parameter); | 1017 | ASN1_TYPE_free(wrap_alg->parameter); |
| 1018 | wrap_alg->parameter = NULL; | 1018 | wrap_alg->parameter = NULL; |
| 1019 | } | 1019 | } |