resolve conflicts

1 files changed, 4 insertions, 0 deletions

diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c
index f0373f7d68..a7e9920efb 100644
--- a/src/lib/libcrypto/dh/dh_check.c
+++ b/src/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;
@@ -118,3 +120,5 @@ err:
         if (q != NULL) BN_free(q);
         return(ok);
         }
+
+#endif