Commit b88dacdd3d for openssl.org

commit b88dacdd3df3bb462e95d49f18d550e211032087
Author: Pauli <paul.dale@oracle.com>
Date:   Thu Aug 27 11:10:03 2026 +1000

    providers: correct advertised cipher tls-mac & multiblock AAD parameter typess

    Match TLS MAC and multiblock AAD metadata to the parameter types actually processed.

    Assisted-by: ChatGPT:gpt-5.6Sol
    Reviewed-by: Simo Sorce <simo@redhat.com>
    Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
    Merge-date: Thu Sep  3 02:16:50 2026
    Merged-from: https://github.com/openssl/openssl/pull/32536

diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.inc.in b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.inc.in
index 5334896070..9ca0852dc9 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.inc.in
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.inc.in
@@ -15,7 +15,7 @@ use OpenSSL::paramnames qw(produce_param_decoder);
                          (['OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT',
                            'maxfrag',  'size_t',       "#if !defined(OPENSSL_NO_MULTIBLOCK)"],
                           ['OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD',
-                           'mb_aad',   'size_t',       "#if !defined(OPENSSL_NO_MULTIBLOCK)"],
+                           'mb_aad',   'octet_string', "#if !defined(OPENSSL_NO_MULTIBLOCK)"],
                           ['OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE',
                            'ileave',   'uint',         "#if !defined(OPENSSL_NO_MULTIBLOCK)"],
                           ['OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC',
diff --git a/providers/implementations/ciphers/ciphercommon.inc.in b/providers/implementations/ciphers/ciphercommon.inc.in
index 997453d24b..d898476d54 100644
--- a/providers/implementations/ciphers/ciphercommon.inc.in
+++ b/providers/implementations/ciphers/ciphercommon.inc.in
@@ -31,7 +31,7 @@ use OpenSSL::paramnames qw(produce_param_decoder);
                           ['OSSL_CIPHER_PARAM_NUM',        'num',    'uint' ],
                           ['OSSL_CIPHER_PARAM_IV',         'iv',     'octet_string' ],
                           ['OSSL_CIPHER_PARAM_UPDATED_IV', 'updiv',  'octet_string' ],
-                          ['OSSL_CIPHER_PARAM_TLS_MAC',    'tlsmac', 'octet_string' ],
+                          ['OSSL_CIPHER_PARAM_TLS_MAC',    'tlsmac', 'octet_ptr' ],
                          )); -}

 {- produce_param_decoder('cipher_generic_set_ctx_params',