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/ffc | |
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/ffc')
-rw-r--r-- | crypto/ffc/ffc_params_generate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/ffc/ffc_params_generate.c b/crypto/ffc/ffc_params_generate.c index 815b38efbf..9285f93c05 100644 --- a/crypto/ffc/ffc_params_generate.c +++ b/crypto/ffc/ffc_params_generate.c @@ -46,7 +46,7 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify) if (L == 2048 && (N == 224 || N == 256)) return 112; # ifndef OPENSSL_NO_DH - DHerr(0, DH_R_BAD_FFC_PARAMETERS); + ERR_raise(ERR_LIB_DH, DH_R_BAD_FFC_PARAMETERS); # endif } else if (type == FFC_PARAM_TYPE_DSA) { /* Valid DSA L,N parameters from FIPS 186-4 Section 4.2 */ @@ -58,7 +58,7 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify) if (L == 3072 && N == 256) return 128; # ifndef OPENSSL_NO_DSA - DSAerr(0, DSA_R_BAD_FFC_PARAMETERS); + ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS); # endif } return 0; @@ -74,7 +74,7 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify) if (L == 2048 && (N == 224 || N == 256)) return 112; # ifndef OPENSSL_NO_DH - DHerr(0, DH_R_BAD_FFC_PARAMETERS); + ERR_raise(ERR_LIB_DH, DH_R_BAD_FFC_PARAMETERS); # endif } else if (type == FFC_PARAM_TYPE_DSA) { if (L == 1024 && N == 160) @@ -84,7 +84,7 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify) if (L == 3072 && N == 256) return 128; # ifndef OPENSSL_NO_DSA - DSAerr(0, DSA_R_BAD_FFC_PARAMETERS); + ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS); # endif } return 0; |