diff options
author | tb <> | 2024-10-28 17:40:46 +0000 |
---|---|---|
committer | tb <> | 2024-10-28 17:40:46 +0000 |
commit | 14337ede20ff409ce7a9e79f939bd3f1d8909e01 (patch) | |
tree | ee7c9433dfbda1b8ef7879ce7f2d258fc7f43167 /src | |
parent | 12e5e111f4326dafde6e71a8ed4e6bb43af9fe42 (diff) | |
download | openbsd-14337ede20ff409ce7a9e79f939bd3f1d8909e01.tar.gz openbsd-14337ede20ff409ce7a9e79f939bd3f1d8909e01.tar.bz2 openbsd-14337ede20ff409ce7a9e79f939bd3f1d8909e01.zip |
Rename the EC_KEY in i2o_ECPublicKey() to ec_key
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c index 6e39501132..842089f813 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.88 2024/10/28 17:39:57 tb Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.89 2024/10/28 17:40:46 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -1342,17 +1342,17 @@ o2i_ECPublicKey(EC_KEY **a, const unsigned char **in, long len) | |||
1342 | LCRYPTO_ALIAS(o2i_ECPublicKey); | 1342 | LCRYPTO_ALIAS(o2i_ECPublicKey); |
1343 | 1343 | ||
1344 | int | 1344 | int |
1345 | i2o_ECPublicKey(const EC_KEY *a, unsigned char **out) | 1345 | i2o_ECPublicKey(const EC_KEY *ec_key, unsigned char **out) |
1346 | { | 1346 | { |
1347 | size_t buf_len = 0; | 1347 | size_t buf_len = 0; |
1348 | int new_buffer = 0; | 1348 | int new_buffer = 0; |
1349 | 1349 | ||
1350 | if (a == NULL) { | 1350 | if (ec_key == NULL) { |
1351 | ECerror(ERR_R_PASSED_NULL_PARAMETER); | 1351 | ECerror(ERR_R_PASSED_NULL_PARAMETER); |
1352 | return 0; | 1352 | return 0; |
1353 | } | 1353 | } |
1354 | buf_len = EC_POINT_point2oct(a->group, a->pub_key, | 1354 | buf_len = EC_POINT_point2oct(ec_key->group, ec_key->pub_key, |
1355 | a->conv_form, NULL, 0, NULL); | 1355 | ec_key->conv_form, NULL, 0, NULL); |
1356 | 1356 | ||
1357 | if (out == NULL || buf_len == 0) | 1357 | if (out == NULL || buf_len == 0) |
1358 | /* out == NULL => just return the length of the octet string */ | 1358 | /* out == NULL => just return the length of the octet string */ |
@@ -1365,7 +1365,7 @@ i2o_ECPublicKey(const EC_KEY *a, unsigned char **out) | |||
1365 | } | 1365 | } |
1366 | new_buffer = 1; | 1366 | new_buffer = 1; |
1367 | } | 1367 | } |
1368 | if (!EC_POINT_point2oct(a->group, a->pub_key, a->conv_form, | 1368 | if (!EC_POINT_point2oct(ec_key->group, ec_key->pub_key, ec_key->conv_form, |
1369 | *out, buf_len, NULL)) { | 1369 | *out, buf_len, NULL)) { |
1370 | ECerror(ERR_R_EC_LIB); | 1370 | ECerror(ERR_R_EC_LIB); |
1371 | if (new_buffer) { | 1371 | if (new_buffer) { |