From 798b03afb0a322b55ffdcfa4230b0502829d0e21 Mon Sep 17 00:00:00 2001 From: WillChilds-Klein Date: Tue, 27 Aug 2024 14:56:54 +0000 Subject: [PATCH] Rename internal callbacks --- crypto/pkcs7/pkcs7_asn1.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crypto/pkcs7/pkcs7_asn1.c b/crypto/pkcs7/pkcs7_asn1.c index 8b7157fdb06..bb1facdca1e 100644 --- a/crypto/pkcs7/pkcs7_asn1.c +++ b/crypto/pkcs7/pkcs7_asn1.c @@ -93,8 +93,8 @@ ASN1_SEQUENCE(PKCS7_ISSUER_AND_SERIAL) = { IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL) -/* Minor tweak to operation: free up X509 */ -static int ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, +// Minor tweak to operation: free up X509. +static int recip_info_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg) { if (operation == ASN1_OP_FREE_POST) { @@ -104,7 +104,7 @@ static int ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, return 1; } -ASN1_SEQUENCE_cb(PKCS7_RECIP_INFO, ri_cb) = { +ASN1_SEQUENCE_cb(PKCS7_RECIP_INFO, recip_info_cb) = { ASN1_SIMPLE(PKCS7_RECIP_INFO, version, ASN1_INTEGER), ASN1_SIMPLE(PKCS7_RECIP_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL), ASN1_SIMPLE(PKCS7_RECIP_INFO, key_enc_algor, X509_ALGOR), @@ -113,8 +113,8 @@ ASN1_SEQUENCE_cb(PKCS7_RECIP_INFO, ri_cb) = { IMPLEMENT_ASN1_FUNCTIONS(PKCS7_RECIP_INFO) -/* Minor tweak to operation: free up EVP_PKEY */ -static int si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, +// Minor tweak to operation: free up EVP_PKEY. +static int signer_info_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg) { PKCS7_SIGNER_INFO *si = (PKCS7_SIGNER_INFO *)*pval; @@ -124,7 +124,7 @@ static int si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, return 1; } -ASN1_SEQUENCE_cb(PKCS7_SIGNER_INFO, si_cb) = { +ASN1_SEQUENCE_cb(PKCS7_SIGNER_INFO, signer_info_cb) = { ASN1_SIMPLE(PKCS7_SIGNER_INFO, version, ASN1_INTEGER), ASN1_SIMPLE(PKCS7_SIGNER_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL), ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_alg, X509_ALGOR),