diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-06-05 21:27:34 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-06-10 11:08:21 +0200 |
| commit | 8da42c8b26393f56acc4f301b95f925eb8902442 (patch) | |
| tree | 8d3f1fff08f041aca7f44a989da546c0adf77a99 /crypto/ffc | |
| parent | 498e807ed257b0f292ba94aea2971b928efbfd91 (diff) | |
Generate error queue entry on FFC_CHECK_BAD_LN_PAIR for DH and DSA
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12062)
Diffstat (limited to 'crypto/ffc')
| -rw-r--r-- | crypto/ffc/ffc_params_generate.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/ffc/ffc_params_generate.c b/crypto/ffc/ffc_params_generate.c index 1d8d80c9b4..624c24dd21 100644 --- a/crypto/ffc/ffc_params_generate.c +++ b/crypto/ffc/ffc_params_generate.c @@ -27,6 +27,9 @@ #include <string.h> /* memset */ #include <openssl/sha.h> /* SHA_DIGEST_LENGTH */ #include <openssl/rand.h> +#include <openssl/err.h> +#include <openssl/dherr.h> +#include <openssl/dsaerr.h> #include "crypto/bn.h" #include "internal/ffc.h" @@ -40,6 +43,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type) /* Valid DH L,N parameters from SP800-56Ar3 5.5.1 Table 1 */ if (L == 2048 && (N == 224 || N == 256)) return 112; +#ifndef OPENSSL_NO_DH + DHerr(0, 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 */ if (L == 1024 && N == 160) @@ -48,6 +54,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type) return 112; if (L == 3072 && N == 256) return 128; +#ifndef OPENSSL_NO_DSA + DSAerr(0, DSA_R_BAD_FFC_PARAMETERS); +#endif } return 0; } |