From 1017ab21e478b18dd2d9266955dee7e418932a3c Mon Sep 17 00:00:00 2001 From: Pauli Date: Fri, 7 Aug 2020 13:20:18 +1000 Subject: [PATCH] provider: add the unused paramater tag to the gettable and settable functions Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/12603) --- providers/implementations/asymciphers/rsa_enc.c | 4 ++-- providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c | 4 ++-- providers/implementations/ciphers/cipher_aes_ocb.c | 4 ++-- providers/implementations/ciphers/cipher_aes_siv.c | 4 ++-- providers/implementations/ciphers/cipher_aes_xts.c | 2 +- providers/implementations/ciphers/cipher_chacha20.c | 4 ++-- providers/implementations/ciphers/cipher_chacha20_poly1305.c | 3 ++- providers/implementations/ciphers/cipher_null.c | 4 ++-- providers/implementations/ciphers/cipher_rc4_hmac_md5.c | 4 ++-- providers/implementations/ciphers/ciphercommon.c | 4 ++-- providers/implementations/digests/md5_sha1_prov.c | 2 +- providers/implementations/digests/mdc2_prov.c | 2 +- providers/implementations/digests/sha2_prov.c | 2 +- providers/implementations/digests/sha3_prov.c | 2 +- providers/implementations/exchange/ecdh_exch.c | 4 ++-- providers/implementations/kdfs/hkdf.c | 4 ++-- providers/implementations/kdfs/kbkdf.c | 4 ++-- providers/implementations/kdfs/krb5kdf.c | 4 ++-- providers/implementations/kdfs/pbkdf2.c | 4 ++-- providers/implementations/kdfs/scrypt.c | 4 ++-- providers/implementations/kdfs/sshkdf.c | 4 ++-- providers/implementations/kdfs/sskdf.c | 4 ++-- providers/implementations/kdfs/tls1_prf.c | 4 ++-- providers/implementations/kdfs/x942kdf.c | 4 ++-- providers/implementations/macs/blake2_mac_impl.c | 4 ++-- providers/implementations/macs/cmac_prov.c | 4 ++-- providers/implementations/macs/gmac_prov.c | 2 +- providers/implementations/macs/hmac_prov.c | 4 ++-- providers/implementations/macs/kmac_prov.c | 4 ++-- providers/implementations/macs/poly1305_prov.c | 2 +- providers/implementations/macs/siphash_prov.c | 2 +- providers/implementations/rands/drbg_ctr.c | 4 ++-- providers/implementations/rands/drbg_hash.c | 4 ++-- providers/implementations/rands/drbg_hmac.c | 4 ++-- providers/implementations/rands/test_rng.c | 4 ++-- providers/implementations/serializers/serializer_dh_priv.c | 2 +- providers/implementations/serializers/serializer_dsa_priv.c | 2 +- providers/implementations/serializers/serializer_ec_priv.c | 2 +- providers/implementations/serializers/serializer_ecx_priv.c | 2 +- providers/implementations/serializers/serializer_rsa_priv.c | 2 +- providers/implementations/signature/dsa.c | 4 ++-- providers/implementations/signature/ecdsa.c | 4 ++-- providers/implementations/signature/rsa.c | 4 ++-- 43 files changed, 73 insertions(+), 72 deletions(-) diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c index 2528cd2dc4..817f705b53 100644 --- a/providers/implementations/asymciphers/rsa_enc.c +++ b/providers/implementations/asymciphers/rsa_enc.c @@ -382,7 +382,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *rsa_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *rsa_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } @@ -526,7 +526,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *rsa_settable_ctx_params(void *provctx) +static const OSSL_PARAM *rsa_settable_ctx_params(ossl_unused void *provctx) { return known_settable_ctx_params; } diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c index 8f731228d9..ae853b7eb9 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c @@ -59,7 +59,7 @@ static const OSSL_PARAM cipher_aes_known_settable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL), OSSL_PARAM_END }; -const OSSL_PARAM *aes_settable_ctx_params(void *provctx) +const OSSL_PARAM *aes_settable_ctx_params(ossl_unused void *provctx) { return cipher_aes_known_settable_ctx_params; } @@ -257,7 +257,7 @@ static const OSSL_PARAM cipher_aes_known_gettable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_IV_STATE, NULL, 0), OSSL_PARAM_END }; -const OSSL_PARAM *aes_gettable_ctx_params(void *provctx) +const OSSL_PARAM *aes_gettable_ctx_params(ossl_unused void *provctx) { return cipher_aes_known_gettable_ctx_params; } diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c index 7be5c7f5e8..d6190695a2 100644 --- a/providers/implementations/ciphers/cipher_aes_ocb.c +++ b/providers/implementations/ciphers/cipher_aes_ocb.c @@ -452,7 +452,7 @@ static const OSSL_PARAM cipher_ocb_known_gettable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *cipher_ocb_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *cipher_ocb_gettable_ctx_params(ossl_unused void *p_ctx) { return cipher_ocb_known_gettable_ctx_params; } @@ -463,7 +463,7 @@ static const OSSL_PARAM cipher_ocb_known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *cipher_ocb_settable_ctx_params(void *provctx) +static const OSSL_PARAM *cipher_ocb_settable_ctx_params(ossl_unused void *p_ctx) { return cipher_ocb_known_settable_ctx_params; } diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c index 2432c6a280..b2e07bc228 100644 --- a/providers/implementations/ciphers/cipher_aes_siv.c +++ b/providers/implementations/ciphers/cipher_aes_siv.c @@ -166,7 +166,7 @@ static const OSSL_PARAM aes_siv_known_gettable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *aes_siv_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *aes_siv_gettable_ctx_params(ossl_unused void *provctx) { return aes_siv_known_gettable_ctx_params; } @@ -216,7 +216,7 @@ static const OSSL_PARAM aes_siv_known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *aes_siv_settable_ctx_params(void *provctx) +static const OSSL_PARAM *aes_siv_settable_ctx_params(ossl_unused void *provctx) { return aes_siv_known_settable_ctx_params; } diff --git a/providers/implementations/ciphers/cipher_aes_xts.c b/providers/implementations/ciphers/cipher_aes_xts.c index 5430b6da1b..33d8c7fbb5 100644 --- a/providers/implementations/ciphers/cipher_aes_xts.c +++ b/providers/implementations/ciphers/cipher_aes_xts.c @@ -211,7 +211,7 @@ static const OSSL_PARAM aes_xts_known_settable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *aes_xts_settable_ctx_params(void *provctx) +static const OSSL_PARAM *aes_xts_settable_ctx_params(ossl_unused void *provctx) { return aes_xts_known_settable_ctx_params; } diff --git a/providers/implementations/ciphers/cipher_chacha20.c b/providers/implementations/ciphers/cipher_chacha20.c index 5d5e62870d..4e02ce9493 100644 --- a/providers/implementations/ciphers/cipher_chacha20.c +++ b/providers/implementations/ciphers/cipher_chacha20.c @@ -91,7 +91,7 @@ static const OSSL_PARAM chacha20_known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL), OSSL_PARAM_END }; -const OSSL_PARAM *chacha20_gettable_ctx_params(void *provctx) +const OSSL_PARAM *chacha20_gettable_ctx_params(ossl_unused void *provctx) { return chacha20_known_gettable_ctx_params; } @@ -131,7 +131,7 @@ static const OSSL_PARAM chacha20_known_settable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL), OSSL_PARAM_END }; -const OSSL_PARAM *chacha20_settable_ctx_params(void *provctx) +const OSSL_PARAM *chacha20_settable_ctx_params(ossl_unused void *provctx) { return chacha20_known_settable_ctx_params; } diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.c b/providers/implementations/ciphers/cipher_chacha20_poly1305.c index 0174337c81..90ff4ce1f5 100644 --- a/providers/implementations/ciphers/cipher_chacha20_poly1305.c +++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.c @@ -135,7 +135,8 @@ static const OSSL_PARAM chacha20_poly1305_known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL), OSSL_PARAM_END }; -static const OSSL_PARAM *chacha20_poly1305_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *chacha20_poly1305_gettable_ctx_params + (ossl_unused void *provctx) { return chacha20_poly1305_known_gettable_ctx_params; } diff --git a/providers/implementations/ciphers/cipher_null.c b/providers/implementations/ciphers/cipher_null.c index c524a83f4a..3cf64c2271 100644 --- a/providers/implementations/ciphers/cipher_null.c +++ b/providers/implementations/ciphers/cipher_null.c @@ -95,7 +95,7 @@ static const OSSL_PARAM null_known_gettable_ctx_params[] = { }; static OSSL_FUNC_cipher_gettable_ctx_params_fn null_gettable_ctx_params; -static const OSSL_PARAM *null_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *null_gettable_ctx_params(ossl_unused void *provctx) { return null_known_gettable_ctx_params; } @@ -131,7 +131,7 @@ static const OSSL_PARAM null_known_settable_ctx_params[] = { }; static OSSL_FUNC_cipher_settable_ctx_params_fn null_settable_ctx_params; -static const OSSL_PARAM *null_settable_ctx_params(void *provctx) +static const OSSL_PARAM *null_settable_ctx_params(ossl_unused void *provctx) { return null_known_settable_ctx_params; } diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c index e17584a0ab..736857ec13 100644 --- a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c +++ b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c @@ -72,7 +72,7 @@ static const OSSL_PARAM rc4_hmac_md5_known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL), OSSL_PARAM_END }; -const OSSL_PARAM *rc4_hmac_md5_gettable_ctx_params(void *provctx) +const OSSL_PARAM *rc4_hmac_md5_gettable_ctx_params(ossl_unused void *provctx) { return rc4_hmac_md5_known_gettable_ctx_params; } @@ -107,7 +107,7 @@ static const OSSL_PARAM rc4_hmac_md5_known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD, NULL, 0), OSSL_PARAM_END }; -const OSSL_PARAM *rc4_hmac_md5_settable_ctx_params(void *provctx) +const OSSL_PARAM *rc4_hmac_md5_settable_ctx_params(ossl_unused void *provctx) { return rc4_hmac_md5_known_settable_ctx_params; } diff --git a/providers/implementations/ciphers/ciphercommon.c b/providers/implementations/ciphers/ciphercommon.c index a5de18ab3b..b49f27f29d 100644 --- a/providers/implementations/ciphers/ciphercommon.c +++ b/providers/implementations/ciphers/ciphercommon.c @@ -118,7 +118,7 @@ static const OSSL_PARAM cipher_aead_known_gettable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, NULL, 0), OSSL_PARAM_END }; -const OSSL_PARAM *cipher_aead_gettable_ctx_params(void *provctx) +const OSSL_PARAM *cipher_aead_gettable_ctx_params(ossl_unused void *provctx) { return cipher_aead_known_gettable_ctx_params; } @@ -131,7 +131,7 @@ static const OSSL_PARAM cipher_aead_known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_SET_IV_INV, NULL, 0), OSSL_PARAM_END }; -const OSSL_PARAM *cipher_aead_settable_ctx_params(void *provctx) +const OSSL_PARAM *cipher_aead_settable_ctx_params(ossl_unused void *provctx) { return cipher_aead_known_settable_ctx_params; } diff --git a/providers/implementations/digests/md5_sha1_prov.c b/providers/implementations/digests/md5_sha1_prov.c index 632fb4a8d0..a65cbbd55c 100644 --- a/providers/implementations/digests/md5_sha1_prov.c +++ b/providers/implementations/digests/md5_sha1_prov.c @@ -30,7 +30,7 @@ static const OSSL_PARAM known_md5_sha1_settable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *md5_sha1_settable_ctx_params(void *provctx) +static const OSSL_PARAM *md5_sha1_settable_ctx_params(ossl_unused void *provctx) { return known_md5_sha1_settable_ctx_params; } diff --git a/providers/implementations/digests/mdc2_prov.c b/providers/implementations/digests/mdc2_prov.c index b1d3b5c0ff..613be655bc 100644 --- a/providers/implementations/digests/mdc2_prov.c +++ b/providers/implementations/digests/mdc2_prov.c @@ -30,7 +30,7 @@ static const OSSL_PARAM known_mdc2_settable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *mdc2_settable_ctx_params(void *provctx) +static const OSSL_PARAM *mdc2_settable_ctx_params(ossl_unused void *provctx) { return known_mdc2_settable_ctx_params; } diff --git a/providers/implementations/digests/sha2_prov.c b/providers/implementations/digests/sha2_prov.c index 94ec269728..fe2f82dc48 100644 --- a/providers/implementations/digests/sha2_prov.c +++ b/providers/implementations/digests/sha2_prov.c @@ -31,7 +31,7 @@ static const OSSL_PARAM known_sha1_settable_ctx_params[] = { {OSSL_DIGEST_PARAM_SSL3_MS, OSSL_PARAM_OCTET_STRING, NULL, 0, 0}, OSSL_PARAM_END }; -static const OSSL_PARAM *sha1_settable_ctx_params(void *provctx) +static const OSSL_PARAM *sha1_settable_ctx_params(ossl_unused void *provctx) { return known_sha1_settable_ctx_params; } diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c index 0703dbe9e0..8cd9c95ab9 100644 --- a/providers/implementations/digests/sha3_prov.c +++ b/providers/implementations/digests/sha3_prov.c @@ -250,7 +250,7 @@ static const OSSL_PARAM known_shake_settable_ctx_params[] = { {OSSL_DIGEST_PARAM_XOFLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0}, OSSL_PARAM_END }; -static const OSSL_PARAM *shake_settable_ctx_params(void *provctx) +static const OSSL_PARAM *shake_settable_ctx_params(ossl_unused void *provctx) { return known_shake_settable_ctx_params; } diff --git a/providers/implementations/exchange/ecdh_exch.c b/providers/implementations/exchange/ecdh_exch.c index a93f67b0b5..88f9c7c9bf 100644 --- a/providers/implementations/exchange/ecdh_exch.c +++ b/providers/implementations/exchange/ecdh_exch.c @@ -279,7 +279,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { }; static -const OSSL_PARAM *ecdh_settable_ctx_params(void *provctx) +const OSSL_PARAM *ecdh_settable_ctx_params(ossl_unused void *provctx) { return known_settable_ctx_params; } @@ -360,7 +360,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { }; static -const OSSL_PARAM *ecdh_gettable_ctx_params(void *provctx) +const OSSL_PARAM *ecdh_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c index fa1e1bcad0..32c0fdabef 100644 --- a/providers/implementations/kdfs/hkdf.c +++ b/providers/implementations/kdfs/hkdf.c @@ -225,7 +225,7 @@ static int kdf_hkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *kdf_hkdf_settable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_hkdf_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_MODE, NULL, 0), @@ -250,7 +250,7 @@ static int kdf_hkdf_get_ctx_params(void *vctx, OSSL_PARAM params[]) return -2; } -static const OSSL_PARAM *kdf_hkdf_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_hkdf_gettable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c index 2801f25a7f..f3122ac1bd 100644 --- a/providers/implementations/kdfs/kbkdf.c +++ b/providers/implementations/kdfs/kbkdf.c @@ -298,7 +298,7 @@ static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *kbkdf_settable_ctx_params(void *provctx) +static const OSSL_PARAM *kbkdf_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_KDF_PARAM_INFO, NULL, 0), @@ -328,7 +328,7 @@ static int kbkdf_get_ctx_params(void *vctx, OSSL_PARAM params[]) return OSSL_PARAM_set_size_t(p, SIZE_MAX); } -static const OSSL_PARAM *kbkdf_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *kbkdf_gettable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), OSSL_PARAM_END }; diff --git a/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c index 052c3b33d3..9a4cf57bc2 100644 --- a/providers/implementations/kdfs/krb5kdf.c +++ b/providers/implementations/kdfs/krb5kdf.c @@ -140,7 +140,7 @@ static int krb5kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *krb5kdf_settable_ctx_params(void *provctx) +static const OSSL_PARAM *krb5kdf_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0), @@ -170,7 +170,7 @@ static int krb5kdf_get_ctx_params(void *vctx, OSSL_PARAM params[]) return -2; } -static const OSSL_PARAM *krb5kdf_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *krb5kdf_gettable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c index 1bacfc8ab5..a71758169a 100644 --- a/providers/implementations/kdfs/pbkdf2.c +++ b/providers/implementations/kdfs/pbkdf2.c @@ -200,7 +200,7 @@ static int kdf_pbkdf2_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *kdf_pbkdf2_settable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_pbkdf2_settable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0), @@ -223,7 +223,7 @@ static int kdf_pbkdf2_get_ctx_params(void *vctx, OSSL_PARAM params[]) return -2; } -static const OSSL_PARAM *kdf_pbkdf2_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_pbkdf2_gettable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), diff --git a/providers/implementations/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c index 5650d1cd5e..76b0a58e1f 100644 --- a/providers/implementations/kdfs/scrypt.c +++ b/providers/implementations/kdfs/scrypt.c @@ -194,7 +194,7 @@ static int kdf_scrypt_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *kdf_scrypt_settable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_scrypt_settable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_KDF_PARAM_PASSWORD, NULL, 0), @@ -217,7 +217,7 @@ static int kdf_scrypt_get_ctx_params(void *vctx, OSSL_PARAM params[]) return -2; } -static const OSSL_PARAM *kdf_scrypt_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_scrypt_gettable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), diff --git a/providers/implementations/kdfs/sshkdf.c b/providers/implementations/kdfs/sshkdf.c index 4fe3e4467f..84338e1a1f 100644 --- a/providers/implementations/kdfs/sshkdf.c +++ b/providers/implementations/kdfs/sshkdf.c @@ -160,7 +160,7 @@ static int kdf_sshkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *kdf_sshkdf_settable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_sshkdf_settable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0), @@ -183,7 +183,7 @@ static int kdf_sshkdf_get_ctx_params(void *vctx, OSSL_PARAM params[]) return -2; } -static const OSSL_PARAM *kdf_sshkdf_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_sshkdf_gettable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c index 5415c72f4f..bad372cc5e 100644 --- a/providers/implementations/kdfs/sskdf.c +++ b/providers/implementations/kdfs/sskdf.c @@ -478,7 +478,7 @@ static int sskdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *sskdf_settable_ctx_params(void *provctx) +static const OSSL_PARAM *sskdf_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SECRET, NULL, 0), @@ -504,7 +504,7 @@ static int sskdf_get_ctx_params(void *vctx, OSSL_PARAM params[]) return -2; } -static const OSSL_PARAM *sskdf_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *sskdf_gettable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), diff --git a/providers/implementations/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c index 46a1253ee8..191041db5b 100644 --- a/providers/implementations/kdfs/tls1_prf.c +++ b/providers/implementations/kdfs/tls1_prf.c @@ -200,7 +200,7 @@ static int kdf_tls1_prf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *kdf_tls1_prf_settable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_tls1_prf_settable_ctx_params(ossl_unused void *ctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0), @@ -221,7 +221,7 @@ static int kdf_tls1_prf_get_ctx_params(void *vctx, OSSL_PARAM params[]) return -2; } -static const OSSL_PARAM *kdf_tls1_prf_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_tls1_prf_gettable_ctx_params(ossl_unused void *ctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c index 9790700bf0..3ca87cddc2 100644 --- a/providers/implementations/kdfs/x942kdf.c +++ b/providers/implementations/kdfs/x942kdf.c @@ -402,7 +402,7 @@ static int x942kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *x942kdf_settable_ctx_params(void *provctx) +static const OSSL_PARAM *x942kdf_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0), @@ -426,7 +426,7 @@ static int x942kdf_get_ctx_params(void *vctx, OSSL_PARAM params[]) return -2; } -static const OSSL_PARAM *x942kdf_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *x942kdf_gettable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), diff --git a/providers/implementations/macs/blake2_mac_impl.c b/providers/implementations/macs/blake2_mac_impl.c index d4e61e44a4..b567369f58 100644 --- a/providers/implementations/macs/blake2_mac_impl.c +++ b/providers/implementations/macs/blake2_mac_impl.c @@ -109,7 +109,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), OSSL_PARAM_END }; -static const OSSL_PARAM *blake2_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *blake2_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } @@ -131,7 +131,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_MAC_PARAM_SALT, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *blake2_mac_settable_ctx_params(void *provctx) +static const OSSL_PARAM *blake2_mac_settable_ctx_params(ossl_unused void *p_ctx) { return known_settable_ctx_params; } diff --git a/providers/implementations/macs/cmac_prov.c b/providers/implementations/macs/cmac_prov.c index c02031a92c..df73b0c11b 100644 --- a/providers/implementations/macs/cmac_prov.c +++ b/providers/implementations/macs/cmac_prov.c @@ -125,7 +125,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), OSSL_PARAM_END }; -static const OSSL_PARAM *cmac_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *cmac_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } @@ -146,7 +146,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *cmac_settable_ctx_params(void *provctx) +static const OSSL_PARAM *cmac_settable_ctx_params(ossl_unused void *provctx) { return known_settable_ctx_params; } diff --git a/providers/implementations/macs/gmac_prov.c b/providers/implementations/macs/gmac_prov.c index 5a69afe89e..f0c152d48f 100644 --- a/providers/implementations/macs/gmac_prov.c +++ b/providers/implementations/macs/gmac_prov.c @@ -158,7 +158,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_MAC_PARAM_IV, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *gmac_settable_ctx_params(void *provctx) +static const OSSL_PARAM *gmac_settable_ctx_params(ossl_unused void *provctx) { return known_settable_ctx_params; } diff --git a/providers/implementations/macs/hmac_prov.c b/providers/implementations/macs/hmac_prov.c index af2a2098cd..b30de6c4a3 100644 --- a/providers/implementations/macs/hmac_prov.c +++ b/providers/implementations/macs/hmac_prov.c @@ -138,7 +138,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), OSSL_PARAM_END }; -static const OSSL_PARAM *hmac_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *hmac_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } @@ -160,7 +160,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_int(OSSL_MAC_PARAM_FLAGS, NULL), OSSL_PARAM_END }; -static const OSSL_PARAM *hmac_settable_ctx_params(void *provctx) +static const OSSL_PARAM *hmac_settable_ctx_params(ossl_unused void *provctx) { return known_settable_ctx_params; } diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c index 792bc6c5bb..ce3247baa2 100644 --- a/providers/implementations/macs/kmac_prov.c +++ b/providers/implementations/macs/kmac_prov.c @@ -306,7 +306,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), OSSL_PARAM_END }; -static const OSSL_PARAM *kmac_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *kmac_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } @@ -328,7 +328,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_MAC_PARAM_CUSTOM, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *kmac_settable_ctx_params(void *provctx) +static const OSSL_PARAM *kmac_settable_ctx_params(ossl_unused void *provctx) { return known_settable_ctx_params; } diff --git a/providers/implementations/macs/poly1305_prov.c b/providers/implementations/macs/poly1305_prov.c index 748cafbaca..08eb81ee0d 100644 --- a/providers/implementations/macs/poly1305_prov.c +++ b/providers/implementations/macs/poly1305_prov.c @@ -121,7 +121,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *poly1305_settable_ctx_params(void *provctx) +static const OSSL_PARAM *poly1305_settable_ctx_params(ossl_unused void *provctx) { return known_settable_ctx_params; } diff --git a/providers/implementations/macs/siphash_prov.c b/providers/implementations/macs/siphash_prov.c index 17137e946b..8797241e33 100644 --- a/providers/implementations/macs/siphash_prov.c +++ b/providers/implementations/macs/siphash_prov.c @@ -112,7 +112,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), OSSL_PARAM_END }; -static const OSSL_PARAM *siphash_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *siphash_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } diff --git a/providers/implementations/rands/drbg_ctr.c b/providers/implementations/rands/drbg_ctr.c index 18737a07f1..609981b9e8 100644 --- a/providers/implementations/rands/drbg_ctr.c +++ b/providers/implementations/rands/drbg_ctr.c @@ -635,7 +635,7 @@ static int drbg_ctr_get_ctx_params(void *vdrbg, OSSL_PARAM params[]) return drbg_get_ctx_params(drbg, params); } -static const OSSL_PARAM *drbg_ctr_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *drbg_ctr_gettable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON, @@ -701,7 +701,7 @@ static int drbg_ctr_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return drbg_set_ctx_params(ctx, params); } -static const OSSL_PARAM *drbg_ctr_settable_ctx_params(void *provctx) +static const OSSL_PARAM *drbg_ctr_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0), diff --git a/providers/implementations/rands/drbg_hash.c b/providers/implementations/rands/drbg_hash.c index b4e1e8036e..ca2f8bb0c6 100644 --- a/providers/implementations/rands/drbg_hash.c +++ b/providers/implementations/rands/drbg_hash.c @@ -432,7 +432,7 @@ static int drbg_hash_get_ctx_params(void *vdrbg, OSSL_PARAM params[]) return drbg_get_ctx_params(drbg, params); } -static const OSSL_PARAM *drbg_hash_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *drbg_hash_gettable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON, @@ -476,7 +476,7 @@ static int drbg_hash_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return drbg_set_ctx_params(ctx, params); } -static const OSSL_PARAM *drbg_hash_settable_ctx_params(void *provctx) +static const OSSL_PARAM *drbg_hash_settable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0), diff --git a/providers/implementations/rands/drbg_hmac.c b/providers/implementations/rands/drbg_hmac.c index def38dd27f..fb232de519 100644 --- a/providers/implementations/rands/drbg_hmac.c +++ b/providers/implementations/rands/drbg_hmac.c @@ -329,7 +329,7 @@ static int drbg_hmac_get_ctx_params(void *vdrbg, OSSL_PARAM params[]) return drbg_get_ctx_params(drbg, params); } -static const OSSL_PARAM *drbg_hmac_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *drbg_hmac_gettable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON, @@ -378,7 +378,7 @@ static int drbg_hmac_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return drbg_set_ctx_params(ctx, params); } -static const OSSL_PARAM *drbg_hmac_settable_ctx_params(void *provctx) +static const OSSL_PARAM *drbg_hmac_settable_ctx_params(ossl_unused void *p_ctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0), diff --git a/providers/implementations/rands/test_rng.c b/providers/implementations/rands/test_rng.c index 3b9d9ca81c..a0507f4d92 100644 --- a/providers/implementations/rands/test_rng.c +++ b/providers/implementations/rands/test_rng.c @@ -186,7 +186,7 @@ static int test_rng_get_ctx_params(void *vdrbg, OSSL_PARAM params[]) return drbg_get_ctx_params(drbg, params); } -static const OSSL_PARAM *test_rng_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *test_rng_gettable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON, @@ -264,7 +264,7 @@ static int test_rng_set_ctx_params(void *vdrbg, const OSSL_PARAM params[]) return drbg_set_ctx_params(drbg, params); } -static const OSSL_PARAM *test_rng_settable_ctx_params(void *provctx) +static const OSSL_PARAM *test_rng_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY, NULL, 0), diff --git a/providers/implementations/serializers/serializer_dh_priv.c b/providers/implementations/serializers/serializer_dh_priv.c index 185f836110..0e974ac401 100644 --- a/providers/implementations/serializers/serializer_dh_priv.c +++ b/providers/implementations/serializers/serializer_dh_priv.c @@ -71,7 +71,7 @@ static void dh_priv_freectx(void *vctx) OPENSSL_free(ctx); } -static const OSSL_PARAM *dh_priv_settable_ctx_params(void *provctx) +static const OSSL_PARAM *dh_priv_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM settables[] = { OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0), diff --git a/providers/implementations/serializers/serializer_dsa_priv.c b/providers/implementations/serializers/serializer_dsa_priv.c index ca8b4e5c9c..0db3ef49e4 100644 --- a/providers/implementations/serializers/serializer_dsa_priv.c +++ b/providers/implementations/serializers/serializer_dsa_priv.c @@ -71,7 +71,7 @@ static void dsa_priv_freectx(void *vctx) OPENSSL_free(ctx); } -static const OSSL_PARAM *dsa_priv_settable_ctx_params(void *provctx) +static const OSSL_PARAM *dsa_priv_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM settables[] = { OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0), diff --git a/providers/implementations/serializers/serializer_ec_priv.c b/providers/implementations/serializers/serializer_ec_priv.c index 6e37b9b3c5..acc6cf7081 100644 --- a/providers/implementations/serializers/serializer_ec_priv.c +++ b/providers/implementations/serializers/serializer_ec_priv.c @@ -65,7 +65,7 @@ static void ec_priv_freectx(void *vctx) OPENSSL_free(ctx); } -static const OSSL_PARAM *ec_priv_settable_ctx_params(void *provctx) +static const OSSL_PARAM *ec_priv_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM settables[] = { OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0), diff --git a/providers/implementations/serializers/serializer_ecx_priv.c b/providers/implementations/serializers/serializer_ecx_priv.c index 904a8559c8..7df1e01fd5 100644 --- a/providers/implementations/serializers/serializer_ecx_priv.c +++ b/providers/implementations/serializers/serializer_ecx_priv.c @@ -88,7 +88,7 @@ static void ecx_priv_freectx(void *vctx) OPENSSL_free(ctx); } -static const OSSL_PARAM *ecx_priv_settable_ctx_params(void *provctx) +static const OSSL_PARAM *ecx_priv_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM settables[] = { OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0), diff --git a/providers/implementations/serializers/serializer_rsa_priv.c b/providers/implementations/serializers/serializer_rsa_priv.c index c11ec786fa..5a589ae020 100644 --- a/providers/implementations/serializers/serializer_rsa_priv.c +++ b/providers/implementations/serializers/serializer_rsa_priv.c @@ -73,7 +73,7 @@ static void rsa_priv_freectx(void *vctx) OPENSSL_free(ctx); } -static const OSSL_PARAM *rsa_priv_settable_ctx_params(void *provctx) +static const OSSL_PARAM *rsa_priv_settable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM settables[] = { OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0), diff --git a/providers/implementations/signature/dsa.c b/providers/implementations/signature/dsa.c index 76c65ceaa8..0b29ad6368 100644 --- a/providers/implementations/signature/dsa.c +++ b/providers/implementations/signature/dsa.c @@ -412,7 +412,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *dsa_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *dsa_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } @@ -454,7 +454,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *dsa_settable_ctx_params(void *provctx) +static const OSSL_PARAM *dsa_settable_ctx_params(ossl_unused void *provctx) { /* * TODO(3.0): Should this function return a different set of settable ctx diff --git a/providers/implementations/signature/ecdsa.c b/providers/implementations/signature/ecdsa.c index 729a2b39ad..d60a996a83 100644 --- a/providers/implementations/signature/ecdsa.c +++ b/providers/implementations/signature/ecdsa.c @@ -399,7 +399,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *ecdsa_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *ecdsa_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } @@ -451,7 +451,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *ecdsa_settable_ctx_params(void *provctx) +static const OSSL_PARAM *ecdsa_settable_ctx_params(ossl_unused void *provctx) { /* * TODO(3.0): Should this function return a different set of settable ctx diff --git a/providers/implementations/signature/rsa.c b/providers/implementations/signature/rsa.c index 491c72d990..05c47dfb65 100644 --- a/providers/implementations/signature/rsa.c +++ b/providers/implementations/signature/rsa.c @@ -983,7 +983,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *rsa_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *rsa_gettable_ctx_params(ossl_unused void *provctx) { return known_gettable_ctx_params; } @@ -1233,7 +1233,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *rsa_settable_ctx_params(void *provctx) +static const OSSL_PARAM *rsa_settable_ctx_params(ossl_unused void *provctx) { /* * TODO(3.0): Should this function return a different set of settable ctx -- 2.34.1