From a88d105ea876f9d67e09eda02ff2c5164f710857 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Sat, 29 Aug 2020 12:33:34 +1000 Subject: [PATCH] Add missing 'ossl_unused' tags to some gettable and settable methods. Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/12745) --- providers/implementations/include/prov/ciphercommon.h | 4 ++-- providers/implementations/kdfs/pkcs12kdf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/providers/implementations/include/prov/ciphercommon.h b/providers/implementations/include/prov/ciphercommon.h index 3789f4c00d2..6d6e86569a1 100644 --- a/providers/implementations/include/prov/ciphercommon.h +++ b/providers/implementations/include/prov/ciphercommon.h @@ -321,7 +321,7 @@ static const OSSL_PARAM name##_known_gettable_ctx_params[] = { \ #define CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(name) \ OSSL_PARAM_END \ }; \ -const OSSL_PARAM * name##_gettable_ctx_params(void *provctx) \ +const OSSL_PARAM * name##_gettable_ctx_params(ossl_unused void *provctx) \ { \ return name##_known_gettable_ctx_params; \ } @@ -333,7 +333,7 @@ static const OSSL_PARAM name##_known_settable_ctx_params[] = { \ #define CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(name) \ OSSL_PARAM_END \ }; \ -const OSSL_PARAM * name##_settable_ctx_params(void *provctx) \ +const OSSL_PARAM * name##_settable_ctx_params(ossl_unused void *provctx) \ { \ return name##_known_settable_ctx_params; \ } diff --git a/providers/implementations/kdfs/pkcs12kdf.c b/providers/implementations/kdfs/pkcs12kdf.c index 52b8305261c..173e86cc7cc 100644 --- a/providers/implementations/kdfs/pkcs12kdf.c +++ b/providers/implementations/kdfs/pkcs12kdf.c @@ -246,7 +246,7 @@ static int kdf_pkcs12_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -static const OSSL_PARAM *kdf_pkcs12_settable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_pkcs12_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), @@ -269,7 +269,7 @@ static int kdf_pkcs12_get_ctx_params(void *vctx, OSSL_PARAM params[]) return -2; } -static const OSSL_PARAM *kdf_pkcs12_gettable_ctx_params(void *provctx) +static const OSSL_PARAM *kdf_pkcs12_gettable_ctx_params(ossl_unused void *provctx) { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), -- 2.47.2