Add missing 'ossl_unused' tags to some gettable and settable methods.
authorShane Lontis <shane.lontis@oracle.com>
Sat, 29 Aug 2020 02:33:34 +0000 (12:33 +1000)
committerMatt Caswell <matt@openssl.org>
Fri, 18 Sep 2020 13:20:38 +0000 (14:20 +0100)
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12745)

providers/implementations/include/prov/ciphercommon.h
providers/implementations/kdfs/pkcs12kdf.c

index 3789f4c00d2e95828bd3a1cd64faa30dc00de22c..6d6e86569a19e27c2f9e171f68c3f2d41aeb19de 100644 (file)
@@ -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;                                   \
 }
index 52b8305261c28c59909aed192158ffdcce18b7d8..173e86cc7cccebbb54ae9047d634cb0c89ab88e0 100644 (file)
@@ -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),