From 23f8d96f0f508b8bef2602049feee9c44228d34c Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 9 Jan 2009 12:15:52 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/dh/dh_check.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/lib/libcrypto/dh/dh_check.c')

diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c
index b846913004..316cb9221d 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;
@@ -140,3 +142,5 @@ err:
 	if (q != NULL) BN_free(q);
 	return(ok);
 	}
+
+#endif
-- 
cgit v1.2.3-55-g6feb