Add flags for DH FIPS method.

Update/fix prototypes in fips.h

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index 63db8c908b00c83d22735df4c340229e2c81db61..e9f9a540b23c8a1b3f1cef106a0a4b31dad65116 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -88,6 +88,21 @@
                                        * be used for all exponents.
                                        */
 
+/* If this flag is set the DH method is FIPS compliant and can be used
+ * in FIPS mode. This is set in the validated module method. If an
+ * application sets this flag in its own methods it is its reposibility
+ * to ensure the result is compliant.
+ */
+
+#define DH_FLAG_FIPS_METHOD                    0x0400
+
+/* If this flag is set the operations normally disabled in FIPS mode are
+ * permitted it is then the applications responsibility to ensure that the
+ * usage is compliant.
+ */
+
+#define DH_FLAG_NON_FIPS_ALLOW                 0x0400
+
 #ifdef  __cplusplus
 extern "C" {
 #endif

diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index ca2435e75fea28d465827df38a061820c53914e0..e296f453bb346cb12773e8d173f8402d74009c8d 100644 (file)
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -108,7 +108,7 @@ compute_key,
 dh_bn_mod_exp,
 dh_init,
 dh_finish,
-0,
+DH_FLAG_FIPS_METHOD,
 NULL,
 NULL
 };

diff --git a/fips/fips.h b/fips/fips.h
index 1e5c759341d9f0421668ed0e71e5734b0e41c612..6731d692a1c74e9852adbb655109ce0b7b0c79d9 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -74,6 +74,7 @@ struct evp_cipher_st;
 struct evp_cipher_ctx_st;
 struct ec_method_st;
 struct ecdsa_method;
+struct dh_method;
 
 int FIPS_module_mode_set(int onoff);
 int FIPS_module_mode(void);
@@ -275,16 +276,18 @@ const EVP_MD *FIPS_evp_ecdsa(void);
 const RSA_METHOD *FIPS_rsa_pkcs1_ssleay(void);
 int FIPS_rsa_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
 
-struct ec_method_st *fips_ec_gf2m_simple_method(void);
-struct ec_method_st *fips_ec_gfp_simple_method(void);
-struct ec_method_st *fips_ec_gfp_mont_method(void);
-struct ec_method_st *fips_ec_gfp_nist_method(void);
+const struct ec_method_st *fips_ec_gf2m_simple_method(void);
+const struct ec_method_st *fips_ec_gfp_simple_method(void);
+const struct ec_method_st *fips_ec_gfp_mont_method(void);
+const struct ec_method_st *fips_ec_gfp_nist_method(void);
 
-struct ecdsa_method *FIPS_ecdsa_openssl(void);
-struct ecdh_method *FIPS_ecdh_openssl(void);
+const struct ecdsa_method *FIPS_ecdsa_openssl(void);
+const struct ecdh_method *FIPS_ecdh_openssl(void);
 
 int FIPS_ec_key_generate_key(struct ec_key_st *key);
 
+const struct dh_method *FIPS_dh_openssl(void);
+
 #endif
 
 /* Where necessary redirect standard OpenSSL APIs to FIPS versions */