From 388a146a2c587d56be04025c768708a606bec6a1 Mon Sep 17 00:00:00 2001
From: damien <damien>
Date: Tue, 4 Apr 2000 04:57:08 +0000
Subject: [PATCH] Removed excess seed_rng calls

---
 bsd-misc.c |  1 -
 kex.c      |  1 -
 packet.c   | 14 +++++++++++---
 rsa.c      |  2 --
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bsd-misc.c b/bsd-misc.c
index 3186c86d..83822cad 100644
--- a/bsd-misc.c
+++ b/bsd-misc.c
@@ -121,7 +121,6 @@ void arc4random_stir(void)
 
 	seed_rng();
 	RAND_bytes(rand_buf, sizeof(rand_buf));
-	seed_rng();
 	
 	rc4_key(rc4, rand_buf, sizeof(rand_buf));
 	memset(rand_buf, 0, sizeof(rand_buf));
diff --git a/kex.c b/kex.c
index d88bf528..0e5f2576 100644
--- a/kex.c
+++ b/kex.c
@@ -111,7 +111,6 @@ new_dh_group1()
 	seed_rng();
 	if (DH_generate_key(dh) == 0)
 		fatal("DH_generate_key");
-	seed_rng();
 
 	return dh;
 }
diff --git a/packet.c b/packet.c
index 98c2abbf..a1e301d6 100644
--- a/packet.c
+++ b/packet.c
@@ -35,9 +35,17 @@ RCSID("$Id$");
 #include "compat.h"
 #include "ssh2.h"
 
-#include <ssl/bn.h>
-#include <ssl/dh.h>
-#include <ssl/hmac.h>
+#ifdef HAVE_OPENSSL
+# include <openssl/bn.h>
+# include <openssl/dh.h>
+# include <openssl/hmac.h>
+#endif /* HAVE_OPENSSL */
+#ifdef HAVE_SSL
+# include <ssl/bn.h>
+# include <ssl/dh.h>
+# include <ssl/hmac.h>
+#endif /* HAVE_SSL */
+
 #include "buffer.h"
 #include "kex.h"
 #include "hmac.h"
diff --git a/rsa.c b/rsa.c
index 4d52251c..67ad9907 100644
--- a/rsa.c
+++ b/rsa.c
@@ -96,8 +96,6 @@ rsa_generate_key(RSA *prv, RSA *pub, unsigned int bits)
 	if (key == NULL)
 		fatal("rsa_generate_key: key generation failed.");
 
-	seed_rng();
-
 	/* Copy public key parameters */
 	pub->n = BN_new();
 	BN_copy(pub->n, key->n);
-- 
2.45.2