The branch master has been updated
via 82a7b2fb001e2ff50389d0894c276880b3bad336 (commit)
from 378b163e4954d0f94106bd23f1fb6062ee1c326b (commit)
- Log -----------------------------------------------------------------
commit 82a7b2fb001e2ff50389d0894c276880b3bad336
Author: Dr. Matthias St. Pierre <matthias.st.pie...@ncp-e.com>
Date: Fri Aug 7 17:48:29 2020 +0200
rand: fix typo in parameter name
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
Reviewed-by: Ben Kaduk <ka...@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/12608)
-----------------------------------------------------------------------
Summary of changes:
providers/implementations/rands/drbg_ctr.c | 4 ++--
providers/implementations/rands/drbg_hash.c | 4 ++--
providers/implementations/rands/drbg_hmac.c | 4 ++--
providers/implementations/rands/drbg_local.h | 4 ++--
providers/implementations/rands/test_rng.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/providers/implementations/rands/drbg_ctr.c
b/providers/implementations/rands/drbg_ctr.c
index 42362f988f..18737a07f1 100644
--- a/providers/implementations/rands/drbg_ctr.c
+++ b/providers/implementations/rands/drbg_ctr.c
@@ -638,7 +638,7 @@ static int drbg_ctr_get_ctx_params(void *vdrbg, OSSL_PARAM
params[])
static const OSSL_PARAM *drbg_ctr_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
- OSSL_PARAM_DRBG_GETABLE_CTX_COMMON,
+ OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON,
OSSL_PARAM_END
};
return known_gettable_ctx_params;
@@ -714,7 +714,7 @@ static const OSSL_PARAM *drbg_ctr_settable_ctx_params(void
*provctx)
*/
OSSL_PARAM_int(OSSL_DRBG_PARAM_USE_DF, NULL),
#endif
- OSSL_PARAM_DRBG_SETABLE_CTX_COMMON,
+ OSSL_PARAM_DRBG_SETTABLE_CTX_COMMON,
OSSL_PARAM_END
};
return known_settable_ctx_params;
diff --git a/providers/implementations/rands/drbg_hash.c
b/providers/implementations/rands/drbg_hash.c
index bec996f084..b4e1e8036e 100644
--- a/providers/implementations/rands/drbg_hash.c
+++ b/providers/implementations/rands/drbg_hash.c
@@ -435,7 +435,7 @@ static int drbg_hash_get_ctx_params(void *vdrbg, OSSL_PARAM
params[])
static const OSSL_PARAM *drbg_hash_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
- OSSL_PARAM_DRBG_GETABLE_CTX_COMMON,
+ OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON,
OSSL_PARAM_END
};
return known_gettable_ctx_params;
@@ -481,7 +481,7 @@ static const OSSL_PARAM *drbg_hash_settable_ctx_params(void
*provctx)
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0),
OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_DIGEST, NULL, 0),
- OSSL_PARAM_DRBG_SETABLE_CTX_COMMON,
+ OSSL_PARAM_DRBG_SETTABLE_CTX_COMMON,
OSSL_PARAM_END
};
return known_settable_ctx_params;
diff --git a/providers/implementations/rands/drbg_hmac.c
b/providers/implementations/rands/drbg_hmac.c
index 041b6cbb07..def38dd27f 100644
--- a/providers/implementations/rands/drbg_hmac.c
+++ b/providers/implementations/rands/drbg_hmac.c
@@ -332,7 +332,7 @@ static int drbg_hmac_get_ctx_params(void *vdrbg, OSSL_PARAM
params[])
static const OSSL_PARAM *drbg_hmac_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
- OSSL_PARAM_DRBG_GETABLE_CTX_COMMON,
+ OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON,
OSSL_PARAM_END
};
return known_gettable_ctx_params;
@@ -384,7 +384,7 @@ static const OSSL_PARAM *drbg_hmac_settable_ctx_params(void
*provctx)
OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0),
OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_DIGEST, NULL, 0),
OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_MAC, NULL, 0),
- OSSL_PARAM_DRBG_SETABLE_CTX_COMMON,
+ OSSL_PARAM_DRBG_SETTABLE_CTX_COMMON,
OSSL_PARAM_END
};
return known_settable_ctx_params;
diff --git a/providers/implementations/rands/drbg_local.h
b/providers/implementations/rands/drbg_local.h
index f5950967c5..3129bba11d 100644
--- a/providers/implementations/rands/drbg_local.h
+++ b/providers/implementations/rands/drbg_local.h
@@ -238,11 +238,11 @@ OSSL_FUNC_rand_unlock_fn drbg_unlock;
int drbg_get_ctx_params(PROV_DRBG *drbg, OSSL_PARAM params[]);
int drbg_set_ctx_params(PROV_DRBG *drbg, const OSSL_PARAM params[]);
-#define OSSL_PARAM_DRBG_SETABLE_CTX_COMMON
\
+#define OSSL_PARAM_DRBG_SETTABLE_CTX_COMMON
\
OSSL_PARAM_uint(OSSL_DRBG_PARAM_RESEED_REQUESTS, NULL), \
OSSL_PARAM_uint64(OSSL_DRBG_PARAM_RESEED_TIME_INTERVAL, NULL)
-#define OSSL_PARAM_DRBG_GETABLE_CTX_COMMON \
+#define OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON \
OSSL_PARAM_int(OSSL_RAND_PARAM_STATE, NULL), \
OSSL_PARAM_uint(OSSL_RAND_PARAM_STRENGTH, NULL), \
OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_REQUEST, NULL), \
diff --git a/providers/implementations/rands/test_rng.c
b/providers/implementations/rands/test_rng.c
index ec3e9368c5..3b9d9ca81c 100644
--- a/providers/implementations/rands/test_rng.c
+++ b/providers/implementations/rands/test_rng.c
@@ -189,7 +189,7 @@ static int test_rng_get_ctx_params(void *vdrbg, OSSL_PARAM
params[])
static const OSSL_PARAM *test_rng_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
- OSSL_PARAM_DRBG_GETABLE_CTX_COMMON,
+ OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON,
OSSL_PARAM_END
};
return known_gettable_ctx_params;
@@ -279,7 +279,7 @@ static const OSSL_PARAM *test_rng_settable_ctx_params(void
*provctx)
OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_ADINLEN, NULL),
OSSL_PARAM_uint(OSSL_DRBG_PARAM_RESEED_CTR, NULL),
OSSL_PARAM_time_t(OSSL_DRBG_PARAM_RESEED_TIME, NULL),
- OSSL_PARAM_DRBG_SETABLE_CTX_COMMON,
+ OSSL_PARAM_DRBG_SETTABLE_CTX_COMMON,
OSSL_PARAM_END
};
return known_settable_ctx_params;
