From: Dr. David von Oheimb <dev@ddvo.net>
Date: Fri, 13 Oct 2023 20:30:31 +0000 (+0200)
Subject: PKCS7_SIGNER_INFO: point out confusing names of digest_enc_alg and enc_digest fields
X-Git-Tag: openssl-3.2.0-beta1~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e15891b477fe9c3d3dc6f331812c9e8afc48dc05;p=thirdparty%2Fopenssl.git

PKCS7_SIGNER_INFO: point out confusing names of digest_enc_alg and enc_digest fields

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22390)
---

diff --git a/include/openssl/pkcs7.h.in b/include/openssl/pkcs7.h.in
index 127d6afea88..57e45dc2fb6 100644
--- a/include/openssl/pkcs7.h.in
+++ b/include/openssl/pkcs7.h.in
@@ -60,8 +60,8 @@ typedef struct pkcs7_signer_info_st {
     PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
     X509_ALGOR *digest_alg;
     STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */
-    X509_ALGOR *digest_enc_alg;
-    ASN1_OCTET_STRING *enc_digest;
+    X509_ALGOR *digest_enc_alg; /* confusing name, actually used for signing */
+    ASN1_OCTET_STRING *enc_digest; /* confusing name, actually signature */
     STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */
     /* The private key to sign with */
     EVP_PKEY *pkey;