From a95585a25ab25668b931a78b7543f707a3354db8 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 29 Apr 2005 05:37:34 +0000
Subject: import of openssl-0.9.7g; tested on platforms from alpha to zaurus,
 ok deraadt@

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

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

diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c
index 06f78b35ab..23777f5a16 100644
--- a/src/lib/libcrypto/dh/dh_gen.c
+++ b/src/lib/libcrypto/dh/dh_gen.c
@@ -86,6 +86,9 @@
  * It's just as OK (and in some sense better) to use a generator of the
  * order-q subgroup.
  */
+
+#ifndef OPENSSL_FIPS
+
 DH *DH_generate_parameters(int prime_len, int generator,
 	     void (*callback)(int,int,void *), void *cb_arg)
 	{
@@ -146,6 +149,7 @@ DH *DH_generate_parameters(int prime_len, int generator,
 	if (callback != NULL) callback(3,0,cb_arg);
 	ret->p=p;
 	ret->g=BN_new();
+	if (ret->g == NULL) goto err;
 	if (!BN_set_word(ret->g,g)) goto err;
 	ok=1;
 err:
@@ -167,3 +171,5 @@ err:
 		}
 	return(ret);
 	}
+
+#endif
-- 
cgit v1.2.3-55-g6feb