summaryrefslogtreecommitdiffstats
path: root/crypto/dh/dh.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-09-16 14:55:26 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-09-16 14:55:26 +0000
commite3f2860e73df9da5fe33395cdc899a149b7e50bf (patch)
treef5b51ea35595f08a658fb9eddbcd2d70f07a2a5d /crypto/dh/dh.h
parent92eb44d238979a00b1c776fac8ee18dba0112c4a (diff)
downloadopenssl-e3f2860e73df9da5fe33395cdc899a149b7e50bf.tar.gz
Merge public key FIPS code, RSA, DSA, DH.
Diffstat (limited to 'crypto/dh/dh.h')
-rw-r--r--crypto/dh/dh.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index ccdf35ae1c..10475ac4b3 100644
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -77,6 +77,8 @@
# define OPENSSL_DH_MAX_MODULUS_BITS 10000
#endif
+#define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
+
#define DH_FLAG_CACHE_MONT_P 0x01
#define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DH
* implementation now uses constant time
@@ -167,6 +169,11 @@ struct dh_st
const DH_METHOD *DH_OpenSSL(void);
+#ifdef OPENSSL_FIPS
+DH * FIPS_dh_new(void);
+void FIPS_dh_free(DH *dh);
+#endif
+
void DH_set_default_method(const DH_METHOD *meth);
const DH_METHOD *DH_get_default_method(void);
int DH_set_method(DH *dh, const DH_METHOD *meth);
@@ -218,6 +225,9 @@ void ERR_load_DH_strings(void);
#define DH_F_DHPARAMS_PRINT 100
#define DH_F_DHPARAMS_PRINT_FP 101
#define DH_F_DH_BUILTIN_GENPARAMS 106
+#define DH_F_DH_COMPUTE_KEY 107
+#define DH_F_DH_GENERATE_KEY 108
+#define DH_F_DH_GENERATE_PARAMETERS 109
#define DH_F_DH_NEW_METHOD 105
#define DH_F_GENERATE_KEY 103
#define DH_F_GENERATE_PARAMETERS 104
@@ -225,6 +235,7 @@ void ERR_load_DH_strings(void);
/* Reason codes. */
#define DH_R_BAD_GENERATOR 101
#define DH_R_INVALID_PUBKEY 102
+#define DH_R_KEY_SIZE_TOO_SMALL 104
#define DH_R_MODULUS_TOO_LARGE 103
#define DH_R_NO_PRIVATE_VALUE 100