From: tb Date: Sat, 12 Aug 2023 07:59:48 +0000 (+0000) Subject: Drop silly int_ prefix from _free() and _size() X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7244e84418ee614c937d826f6a4b4e25cf0ec00c;p=openbsd Drop silly int_ prefix from _free() and _size() --- diff --git a/lib/libcrypto/dh/dh_ameth.c b/lib/libcrypto/dh/dh_ameth.c index ec9fe43d2b2..43beb469f22 100644 --- a/lib/libcrypto/dh/dh_ameth.c +++ b/lib/libcrypto/dh/dh_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_ameth.c,v 1.38 2023/08/12 07:50:47 tb Exp $ */ +/* $OpenBSD: dh_ameth.c,v 1.39 2023/08/12 07:59:48 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -70,7 +70,7 @@ #include "evp_local.h" static void -int_dh_free(EVP_PKEY *pkey) +dh_free(EVP_PKEY *pkey) { DH_free(pkey->pkey.dh); } @@ -388,7 +388,7 @@ do_dh_print(BIO *bp, const DH *x, int indent, ASN1_PCTX *ctx, int ptype) } static int -int_dh_size(const EVP_PKEY *pkey) +dh_size(const EVP_PKEY *pkey) { return DH_size(pkey->pkey.dh); } @@ -538,7 +538,7 @@ const EVP_PKEY_ASN1_METHOD dh_asn1_meth = { .priv_encode = dh_priv_encode, .priv_print = dh_private_print, - .pkey_size = int_dh_size, + .pkey_size = dh_size, .pkey_bits = dh_bits, .pkey_security_bits = dh_security_bits, @@ -549,7 +549,7 @@ const EVP_PKEY_ASN1_METHOD dh_asn1_meth = { .param_cmp = dh_cmp_parameters, .param_print = dh_param_print, - .pkey_free = int_dh_free, + .pkey_free = dh_free, .pkey_check = NULL, .pkey_public_check = dh_pkey_public_check, diff --git a/lib/libcrypto/dsa/dsa_ameth.c b/lib/libcrypto/dsa/dsa_ameth.c index d6b0546c040..4c20b45b187 100644 --- a/lib/libcrypto/dsa/dsa_ameth.c +++ b/lib/libcrypto/dsa/dsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_ameth.c,v 1.54 2023/08/12 07:50:47 tb Exp $ */ +/* $OpenBSD: dsa_ameth.c,v 1.55 2023/08/12 07:59:48 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -336,7 +336,7 @@ dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) } static int -int_dsa_size(const EVP_PKEY *pkey) +dsa_size(const EVP_PKEY *pkey) { return DSA_size(pkey->pkey.dsa); } @@ -404,7 +404,7 @@ dsa_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) } static void -int_dsa_free(EVP_PKEY *pkey) +dsa_free(EVP_PKEY *pkey) { DSA_free(pkey->pkey.dsa); } @@ -717,7 +717,7 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] = { .priv_encode = dsa_priv_encode, .priv_print = dsa_priv_print, - .pkey_size = int_dsa_size, + .pkey_size = dsa_size, .pkey_bits = dsa_bits, .pkey_security_bits = dsa_security_bits, @@ -729,7 +729,7 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] = { .param_print = dsa_param_print, .sig_print = dsa_sig_print, - .pkey_free = int_dsa_free, + .pkey_free = dsa_free, .pkey_ctrl = dsa_pkey_ctrl, .old_priv_decode = old_dsa_priv_decode, .old_priv_encode = old_dsa_priv_encode