diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-04 12:23:19 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-13 09:35:02 +0100 |
| commit | 9311d0c471ca2eaa259e8c1bbbeb7c46394c7ba2 (patch) | |
| tree | e82c26569e5a952980e65a746af920beed602aab /crypto/param_build.c | |
| parent | 31a6b52f6db009c639c67387a707dd235f29a430 (diff) | |
Convert all {NAME}err() in crypto/ to their corresponding ERR_raise() call
This includes error reporting for libcrypto sub-libraries in surprising
places.
This was done using util/err-to-raise
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13318)
Diffstat (limited to 'crypto/param_build.c')
| -rw-r--r-- | crypto/param_build.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/crypto/param_build.c b/crypto/param_build.c index de829d354f..ce9eaa1fec 100644 --- a/crypto/param_build.c +++ b/crypto/param_build.c @@ -68,7 +68,7 @@ static OSSL_PARAM_BLD_DEF *param_push(OSSL_PARAM_BLD *bld, const char *key, OSSL_PARAM_BLD_DEF *pd = OPENSSL_zalloc(sizeof(*pd)); if (pd == NULL) { - CRYPTOerr(CRYPTO_F_PARAM_PUSH, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); return NULL; } pd->key = key; @@ -94,7 +94,7 @@ static int param_push_num(OSSL_PARAM_BLD *bld, const char *key, if (pd == NULL) return 0; if (size > sizeof(pd->num)) { - CRYPTOerr(CRYPTO_F_PARAM_PUSH_NUM, CRYPTO_R_TOO_MANY_BYTES); + ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_TOO_MANY_BYTES); return 0; } memcpy(&pd->num, num, size); @@ -219,11 +219,11 @@ int OSSL_PARAM_BLD_push_BN_pad(OSSL_PARAM_BLD *bld, const char *key, if (bn != NULL) { n = BN_num_bytes(bn); if (n < 0) { - CRYPTOerr(0, CRYPTO_R_ZERO_LENGTH_NUMBER); + ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_ZERO_LENGTH_NUMBER); return 0; } if (sz < (size_t)n) { - CRYPTOerr(0, CRYPTO_R_TOO_SMALL_BUFFER); + ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_TOO_SMALL_BUFFER); return 0; } if (BN_get_flags(bn, BN_FLG_SECURE) == BN_FLG_SECURE) @@ -244,8 +244,7 @@ int OSSL_PARAM_BLD_push_utf8_string(OSSL_PARAM_BLD *bld, const char *key, if (bsize == 0) { bsize = strlen(buf) + 1; } else if (bsize > INT_MAX) { - CRYPTOerr(CRYPTO_F_OSSL_PARAM_BLD_PUSH_UTF8_STRING, - CRYPTO_R_STRING_TOO_LONG); + ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_STRING_TOO_LONG); return 0; } pd = param_push(bld, key, bsize, bsize, OSSL_PARAM_UTF8_STRING, 0); @@ -263,8 +262,7 @@ int OSSL_PARAM_BLD_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key, if (bsize == 0) { bsize = strlen(buf) + 1; } else if (bsize > INT_MAX) { - CRYPTOerr(CRYPTO_F_OSSL_PARAM_BLD_PUSH_UTF8_PTR, - CRYPTO_R_STRING_TOO_LONG); + ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_STRING_TOO_LONG); return 0; } pd = param_push(bld, key, bsize, sizeof(buf), OSSL_PARAM_UTF8_PTR, 0); @@ -280,8 +278,7 @@ int OSSL_PARAM_BLD_push_octet_string(OSSL_PARAM_BLD *bld, const char *key, OSSL_PARAM_BLD_DEF *pd; if (bsize > INT_MAX) { - CRYPTOerr(CRYPTO_F_OSSL_PARAM_BLD_PUSH_OCTET_STRING, - CRYPTO_R_STRING_TOO_LONG); + ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_STRING_TOO_LONG); return 0; } pd = param_push(bld, key, bsize, bsize, OSSL_PARAM_OCTET_STRING, 0); @@ -297,8 +294,7 @@ int OSSL_PARAM_BLD_push_octet_ptr(OSSL_PARAM_BLD *bld, const char *key, OSSL_PARAM_BLD_DEF *pd; if (bsize > INT_MAX) { - CRYPTOerr(CRYPTO_F_OSSL_PARAM_BLD_PUSH_OCTET_PTR, - CRYPTO_R_STRING_TOO_LONG); + ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_STRING_TOO_LONG); return 0; } pd = param_push(bld, key, bsize, sizeof(buf), OSSL_PARAM_OCTET_PTR, 0); @@ -368,14 +364,13 @@ OSSL_PARAM *OSSL_PARAM_BLD_to_param(OSSL_PARAM_BLD *bld) if (ss > 0) { s = OPENSSL_secure_malloc(ss); if (s == NULL) { - CRYPTOerr(CRYPTO_F_OSSL_PARAM_BLD_TO_PARAM, - CRYPTO_R_SECURE_MALLOC_FAILURE); + ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_SECURE_MALLOC_FAILURE); return NULL; } } params = OPENSSL_malloc(total); if (params == NULL) { - CRYPTOerr(CRYPTO_F_OSSL_PARAM_BLD_TO_PARAM, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); OPENSSL_secure_free(s); return NULL; } |