diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2009-01-09 12:15:53 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2009-01-09 12:15:53 +0000 |
| commit | 6d17bf8726d06249097f42aa5b8fb41c345eeab8 (patch) | |
| tree | 791e92f5e63e9cfece89543fce77b515015ab96c /lib/libcrypto/dh/dh_check.c | |
| parent | d30d6ad00561d36a052e2a024020f6802756f04a (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/dh/dh_check.c')
| -rw-r--r-- | lib/libcrypto/dh/dh_check.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libcrypto/dh/dh_check.c b/lib/libcrypto/dh/dh_check.c index b8469130045..316cb9221df 100644 --- a/lib/libcrypto/dh/dh_check.c +++ b/lib/libcrypto/dh/dh_check.c @@ -70,6 +70,8 @@ * should hold. */ +#ifndef OPENSSL_FIPS + int DH_check(const DH *dh, int *ret) { int ok=0; @@ -140,3 +142,5 @@ err: if (q != NULL) BN_free(q); return(ok); } + +#endif |