summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2021-03-11 13:36:27 +1000
committerShane Lontis <shane.lontis@oracle.com>2021-03-15 09:01:51 +1000
commit3a37ddde911fe735c73121a8a561451cc719fc91 (patch)
tree36c5f038fa4efbf166358a48e465744bd3c965ca /include
parent91bd45eb9ac26daf87abc2c21cb03143a745a420 (diff)
Fix DSA EVP_PKEY_param_check() when defaults are used for param generation.
Fixes #14480 An internal flag that is set during param gen was not being tested, so the wrong type was used to select the dsa domain param validation method. In the default provider - if no gen_type is set then by default the fips186_4 gentype will be selected when pbits >=2048 otherwise it selects fips186_2. The fips provider ignores the gen_type and always uses fips186_4. Before this change dsa used fips186_2 by default in the default provider. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14508)
Diffstat (limited to 'include')
-rw-r--r--include/crypto/dsa.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/crypto/dsa.h b/include/crypto/dsa.h
index 331baf320e..0c15c51da0 100644
--- a/include/crypto/dsa.h
+++ b/include/crypto/dsa.h
@@ -17,6 +17,7 @@
#define DSA_PARAMGEN_TYPE_FIPS_186_4 0 /* Use FIPS186-4 standard */
#define DSA_PARAMGEN_TYPE_FIPS_186_2 1 /* Use legacy FIPS186-2 standard */
+#define DSA_PARAMGEN_TYPE_FIPS_DEFAULT 2
DSA *ossl_dsa_new(OSSL_LIB_CTX *libctx);
void ossl_dsa_set0_libctx(DSA *d, OSSL_LIB_CTX *libctx);