diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-09-05 11:23:57 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-05 11:23:57 +1000 |
| commit | 1c3ace6898032b7b45d8106ba4e0d21d75b0997e (patch) | |
| tree | 5e07997567a0c99c1a0d55a2a4d258f614b0f7e0 /providers/common/digests/digest_common.c | |
| parent | bc5a80910dccbc1e417f96bb7f0a3814d3ad5a4d (diff) | |
Change provider params from int to size_t
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9699)
Diffstat (limited to 'providers/common/digests/digest_common.c')
| -rw-r--r-- | providers/common/digests/digest_common.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/providers/common/digests/digest_common.c b/providers/common/digests/digest_common.c index de135b0a94..062209f329 100644 --- a/providers/common/digests/digest_common.c +++ b/providers/common/digests/digest_common.c @@ -11,18 +11,18 @@ #include "internal/digestcommon.h" #include "internal/providercommonerr.h" -int digest_default_get_params(OSSL_PARAM params[], int blksz, int paramsz, +int digest_default_get_params(OSSL_PARAM params[], size_t blksz, size_t paramsz, unsigned long flags) { OSSL_PARAM *p = NULL; p = OSSL_PARAM_locate(params, OSSL_DIGEST_PARAM_BLOCK_SIZE); - if (p != NULL && !OSSL_PARAM_set_int(p, blksz)) { + if (p != NULL && !OSSL_PARAM_set_size_t(p, blksz)) { ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER); return 0; } p = OSSL_PARAM_locate(params, OSSL_DIGEST_PARAM_SIZE); - if (p != NULL && !OSSL_PARAM_set_int(p, paramsz)) { + if (p != NULL && !OSSL_PARAM_set_size_t(p, paramsz)) { ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER); return 0; } @@ -35,10 +35,9 @@ int digest_default_get_params(OSSL_PARAM params[], int blksz, int paramsz, } static const OSSL_PARAM digest_default_known_gettable_params[] = { - { OSSL_DIGEST_PARAM_BLOCK_SIZE, OSSL_PARAM_INTEGER, NULL, sizeof(int), 0}, - { OSSL_DIGEST_PARAM_SIZE, OSSL_PARAM_INTEGER, NULL, sizeof(int), 0}, - { OSSL_DIGEST_PARAM_FLAGS, OSSL_PARAM_INTEGER, NULL, - sizeof(unsigned long), 0}, + OSSL_PARAM_size_t(OSSL_DIGEST_PARAM_BLOCK_SIZE, NULL), + OSSL_PARAM_size_t(OSSL_DIGEST_PARAM_SIZE, NULL), + OSSL_PARAM_ulong(OSSL_DIGEST_PARAM_FLAGS, NULL), OSSL_PARAM_END }; const OSSL_PARAM *digest_default_gettable_params(void) |