diff options
author | tb <> | 2024-10-27 09:38:49 +0000 |
---|---|---|
committer | tb <> | 2024-10-27 09:38:49 +0000 |
commit | fc2cb66f0ea3c56212f08445efb2249d14ad832c (patch) | |
tree | 5fceb980fb36276587c0f243e48397030696ca2f /src | |
parent | 4401c4fdbb029155cf39fccf80df9231e99e7a7a (diff) | |
download | openbsd-fc2cb66f0ea3c56212f08445efb2249d14ad832c.tar.gz openbsd-fc2cb66f0ea3c56212f08445efb2249d14ad832c.tar.bz2 openbsd-fc2cb66f0ea3c56212f08445efb2249d14ad832c.zip |
d2i_ECParameters: rename ret to ec_key
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c index a5224f28c8..4e4e9b062e 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.84 2024/10/27 09:37:28 tb Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.85 2024/10/27 09:38:49 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -1283,30 +1283,30 @@ LCRYPTO_ALIAS(i2d_ECParameters); | |||
1283 | EC_KEY * | 1283 | EC_KEY * |
1284 | d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len) | 1284 | d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len) |
1285 | { | 1285 | { |
1286 | EC_KEY *ret; | 1286 | EC_KEY *ec_key; |
1287 | 1287 | ||
1288 | if (in == NULL || *in == NULL) { | 1288 | if (in == NULL || *in == NULL) { |
1289 | ECerror(ERR_R_PASSED_NULL_PARAMETER); | 1289 | ECerror(ERR_R_PASSED_NULL_PARAMETER); |
1290 | return NULL; | 1290 | return NULL; |
1291 | } | 1291 | } |
1292 | if (a == NULL || *a == NULL) { | 1292 | if (a == NULL || *a == NULL) { |
1293 | if ((ret = EC_KEY_new()) == NULL) { | 1293 | if ((ec_key = EC_KEY_new()) == NULL) { |
1294 | ECerror(ERR_R_MALLOC_FAILURE); | 1294 | ECerror(ERR_R_MALLOC_FAILURE); |
1295 | return NULL; | 1295 | return NULL; |
1296 | } | 1296 | } |
1297 | } else | 1297 | } else |
1298 | ret = *a; | 1298 | ec_key = *a; |
1299 | 1299 | ||
1300 | if (!d2i_ECPKParameters(&ret->group, in, len)) { | 1300 | if (!d2i_ECPKParameters(&ec_key->group, in, len)) { |
1301 | ECerror(ERR_R_EC_LIB); | 1301 | ECerror(ERR_R_EC_LIB); |
1302 | if (a == NULL || *a != ret) | 1302 | if (a == NULL || *a != ec_key) |
1303 | EC_KEY_free(ret); | 1303 | EC_KEY_free(ec_key); |
1304 | return NULL; | 1304 | return NULL; |
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | if (a != NULL) | 1307 | if (a != NULL) |
1308 | *a = ret; | 1308 | *a = ec_key; |
1309 | return ret; | 1309 | return ec_key; |
1310 | } | 1310 | } |
1311 | LCRYPTO_ALIAS(d2i_ECParameters); | 1311 | LCRYPTO_ALIAS(d2i_ECParameters); |
1312 | 1312 | ||