1 files changed, 4 insertions, 9 deletions

diff --git a/src/lib/libssl/src/fips/dh/fips_dh_check.c b/src/lib/libcrypto/dh/dh_check.c
index 7333f7c80f..066898174e 100644
--- a/src/lib/libssl/src/fips/dh/fips_dh_check.c
+++ b/src/lib/libcrypto/dh/dh_check.c
@@ -57,13 +57,12 @@
  */
 
 #include <stdio.h>
+#include "cryptlib.h"
 #include <openssl/bn.h>
 #include <openssl/dh.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
 
 /* Check that p is a safe prime and
- * if g is 2, 3 or 5, check that is is a suitable generator
+ * if g is 2, 3 or 5, check that it is a suitable generator
  * where
  * for 2, p mod 24 == 11
  * for 3, p mod 12 == 5
@@ -71,8 +70,6 @@
  * should hold.
  */
 
-#ifdef OPENSSL_FIPS
-
 int DH_check(const DH *dh, int *ret)
         {
         int ok=0;
@@ -131,11 +128,11 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret)
         q=BN_new();
         if (q == NULL) goto err;
         BN_set_word(q,1);
-        if (BN_cmp(pub_key,q) <= 0)
+        if (BN_cmp(pub_key,q)<=0)
                 *ret|=DH_CHECK_PUBKEY_TOO_SMALL;
         BN_copy(q,dh->p);
         BN_sub_word(q,1);
-        if (BN_cmp(pub_key,q) >= 0)
+        if (BN_cmp(pub_key,q)>=0)
                 *ret|=DH_CHECK_PUBKEY_TOO_LARGE;
 
         ok = 1;
@@ -143,5 +140,3 @@ err:
         if (q != NULL) BN_free(q);
         return(ok);
         }
-
-#endif