diff options
author | tb <> | 2023-12-25 21:31:58 +0000 |
---|---|---|
committer | tb <> | 2023-12-25 21:31:58 +0000 |
commit | d03ae436a18aad2333592e70d9d5f629886f8a22 (patch) | |
tree | d22b694a45de129517df795c9723fd70bc66bc4e /src/lib | |
parent | aef50a7d0d902ea9c4396b4db94bdd9c5ad59347 (diff) | |
download | openbsd-d03ae436a18aad2333592e70d9d5f629886f8a22.tar.gz openbsd-d03ae436a18aad2333592e70d9d5f629886f8a22.tar.bz2 openbsd-d03ae436a18aad2333592e70d9d5f629886f8a22.zip |
Rename EVP_PKEY_free_it() into evp_pkey_free_pkey_ptr()
ok jsing
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/evp/p_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c index bce4a0b526..9fc45714ed 100644 --- a/src/lib/libcrypto/evp/p_lib.c +++ b/src/lib/libcrypto/evp/p_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p_lib.c,v 1.42 2023/12/25 21:30:53 tb Exp $ */ | 1 | /* $OpenBSD: p_lib.c,v 1.43 2023/12/25 21:31:58 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -215,7 +215,7 @@ EVP_PKEY_up_ref(EVP_PKEY *pkey) | |||
215 | } | 215 | } |
216 | 216 | ||
217 | static void | 217 | static void |
218 | EVP_PKEY_free_it(EVP_PKEY *x) | 218 | evp_pkey_free_pkey_ptr(EVP_PKEY *x) |
219 | { | 219 | { |
220 | if (x->ameth && x->ameth->pkey_free) { | 220 | if (x->ameth && x->ameth->pkey_free) { |
221 | x->ameth->pkey_free(x); | 221 | x->ameth->pkey_free(x); |
@@ -234,7 +234,7 @@ pkey_set_type(EVP_PKEY *pkey, int type, const char *str, int len) | |||
234 | 234 | ||
235 | if (pkey) { | 235 | if (pkey) { |
236 | if (pkey->pkey.ptr) | 236 | if (pkey->pkey.ptr) |
237 | EVP_PKEY_free_it(pkey); | 237 | evp_pkey_free_pkey_ptr(pkey); |
238 | /* If key type matches and a method exists then this | 238 | /* If key type matches and a method exists then this |
239 | * lookup has succeeded once so just indicate success. | 239 | * lookup has succeeded once so just indicate success. |
240 | */ | 240 | */ |
@@ -593,7 +593,7 @@ EVP_PKEY_free(EVP_PKEY *x) | |||
593 | if (i > 0) | 593 | if (i > 0) |
594 | return; | 594 | return; |
595 | 595 | ||
596 | EVP_PKEY_free_it(x); | 596 | evp_pkey_free_pkey_ptr(x); |
597 | if (x->attributes) | 597 | if (x->attributes) |
598 | sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free); | 598 | sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free); |
599 | free(x); | 599 | free(x); |