diff options
| author | tb <> | 2024-10-26 14:40:16 +0000 |
|---|---|---|
| committer | tb <> | 2024-10-26 14:40:16 +0000 |
| commit | 36bb4d09e80113fd8f5168e0340790b72bd34827 (patch) | |
| tree | e7dc2997fb429f9f7a094b26924141de3acdd43f /src | |
| parent | 1d743dd75a5e3fae927a867b33fb3a2f33394364 (diff) | |
| download | openbsd-36bb4d09e80113fd8f5168e0340790b72bd34827.tar.gz openbsd-36bb4d09e80113fd8f5168e0340790b72bd34827.tar.bz2 openbsd-36bb4d09e80113fd8f5168e0340790b72bd34827.zip | |
d2i_ECPrivateKey: move the version setting where it belongs
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 18e2e050f2..1ea579a83b 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.82 2024/10/26 14:35:32 tb Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.83 2024/10/26 14:40:16 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
| 4 | */ | 4 | */ |
| @@ -1105,6 +1105,7 @@ d2i_ECPrivateKey(EC_KEY **out_ec_key, const unsigned char **in, long len) | |||
| 1105 | goto err; | 1105 | goto err; |
| 1106 | } | 1106 | } |
| 1107 | 1107 | ||
| 1108 | ec_key->version = ec_privatekey->version; | ||
| 1108 | if (ec_privatekey->parameters) { | 1109 | if (ec_privatekey->parameters) { |
| 1109 | EC_GROUP_free(ec_key->group); | 1110 | EC_GROUP_free(ec_key->group); |
| 1110 | ec_key->group = ec_asn1_pkparameters2group(ec_privatekey->parameters); | 1111 | ec_key->group = ec_asn1_pkparameters2group(ec_privatekey->parameters); |
| @@ -1113,7 +1114,6 @@ d2i_ECPrivateKey(EC_KEY **out_ec_key, const unsigned char **in, long len) | |||
| 1113 | ECerror(ERR_R_EC_LIB); | 1114 | ECerror(ERR_R_EC_LIB); |
| 1114 | goto err; | 1115 | goto err; |
| 1115 | } | 1116 | } |
| 1116 | ec_key->version = ec_privatekey->version; | ||
| 1117 | 1117 | ||
| 1118 | if (ec_privatekey->privateKey) { | 1118 | if (ec_privatekey->privateKey) { |
| 1119 | ec_key->priv_key = BN_bin2bn( | 1119 | ec_key->priv_key = BN_bin2bn( |