diff options
author | tb <> | 2023-08-12 08:02:43 +0000 |
---|---|---|
committer | tb <> | 2023-08-12 08:02:43 +0000 |
commit | 76946588b15dada1dde5a780f4110b638047ac00 (patch) | |
tree | 33618c14b29ea72bc45f7cb67c682c0b4e1415c6 | |
parent | 2f2b959669dd0ec951ba6f37222b6458832fb82d (diff) | |
download | openbsd-76946588b15dada1dde5a780f4110b638047ac00.tar.gz openbsd-76946588b15dada1dde5a780f4110b638047ac00.tar.bz2 openbsd-76946588b15dada1dde5a780f4110b638047ac00.zip |
RSA's _free and _size also lose their int_ prefix
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_ameth.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c index 46837881ed..ae38c205af 100644 --- a/src/lib/libcrypto/rsa/rsa_ameth.c +++ b/src/lib/libcrypto/rsa/rsa_ameth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_ameth.c,v 1.32 2023/08/10 15:05:28 tb Exp $ */ | 1 | /* $OpenBSD: rsa_ameth.c,v 1.33 2023/08/12 08:02:43 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 | */ |
@@ -273,7 +273,7 @@ rsa_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8) | |||
273 | } | 273 | } |
274 | 274 | ||
275 | static int | 275 | static int |
276 | int_rsa_size(const EVP_PKEY *pkey) | 276 | rsa_size(const EVP_PKEY *pkey) |
277 | { | 277 | { |
278 | return RSA_size(pkey->pkey.rsa); | 278 | return RSA_size(pkey->pkey.rsa); |
279 | } | 279 | } |
@@ -291,7 +291,7 @@ rsa_security_bits(const EVP_PKEY *pkey) | |||
291 | } | 291 | } |
292 | 292 | ||
293 | static void | 293 | static void |
294 | int_rsa_free(EVP_PKEY *pkey) | 294 | rsa_free(EVP_PKEY *pkey) |
295 | { | 295 | { |
296 | RSA_free(pkey->pkey.rsa); | 296 | RSA_free(pkey->pkey.rsa); |
297 | } | 297 | } |
@@ -1088,13 +1088,13 @@ const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = { | |||
1088 | .priv_encode = rsa_priv_encode, | 1088 | .priv_encode = rsa_priv_encode, |
1089 | .priv_print = rsa_priv_print, | 1089 | .priv_print = rsa_priv_print, |
1090 | 1090 | ||
1091 | .pkey_size = int_rsa_size, | 1091 | .pkey_size = rsa_size, |
1092 | .pkey_bits = rsa_bits, | 1092 | .pkey_bits = rsa_bits, |
1093 | .pkey_security_bits = rsa_security_bits, | 1093 | .pkey_security_bits = rsa_security_bits, |
1094 | 1094 | ||
1095 | .sig_print = rsa_sig_print, | 1095 | .sig_print = rsa_sig_print, |
1096 | 1096 | ||
1097 | .pkey_free = int_rsa_free, | 1097 | .pkey_free = rsa_free, |
1098 | .pkey_ctrl = rsa_pkey_ctrl, | 1098 | .pkey_ctrl = rsa_pkey_ctrl, |
1099 | .old_priv_decode = old_rsa_priv_decode, | 1099 | .old_priv_decode = old_rsa_priv_decode, |
1100 | .old_priv_encode = old_rsa_priv_encode, | 1100 | .old_priv_encode = old_rsa_priv_encode, |
@@ -1130,13 +1130,13 @@ const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth = { | |||
1130 | .priv_encode = rsa_priv_encode, | 1130 | .priv_encode = rsa_priv_encode, |
1131 | .priv_print = rsa_priv_print, | 1131 | .priv_print = rsa_priv_print, |
1132 | 1132 | ||
1133 | .pkey_size = int_rsa_size, | 1133 | .pkey_size = rsa_size, |
1134 | .pkey_bits = rsa_bits, | 1134 | .pkey_bits = rsa_bits, |
1135 | .pkey_security_bits = rsa_security_bits, | 1135 | .pkey_security_bits = rsa_security_bits, |
1136 | 1136 | ||
1137 | .sig_print = rsa_sig_print, | 1137 | .sig_print = rsa_sig_print, |
1138 | 1138 | ||
1139 | .pkey_free = int_rsa_free, | 1139 | .pkey_free = rsa_free, |
1140 | .pkey_ctrl = rsa_pkey_ctrl, | 1140 | .pkey_ctrl = rsa_pkey_ctrl, |
1141 | .item_verify = rsa_item_verify, | 1141 | .item_verify = rsa_item_verify, |
1142 | .item_sign = rsa_item_sign | 1142 | .item_sign = rsa_item_sign |