From 5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 16 Apr 2000 12:31:48 +1000
Subject:  - Reduce diff against OpenBSD source    - All OpenSSL includes are
 now unconditionally referenced as      openssl/foo.h    - Pick up formatting
 changes    - Other minor changed (typecasts, etc) that I missed

---
 entropy.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'entropy.c')

diff --git a/entropy.c b/entropy.c
index f304e21c1..549fe7026 100644
--- a/entropy.c
+++ b/entropy.c
@@ -32,16 +32,10 @@
 #include "ssh.h"
 #include "xmalloc.h"
 
-#ifdef HAVE_OPENSSL
-# include <openssl/rand.h>
-# include <openssl/sha.h>
-#endif
-#ifdef HAVE_SSL
-# include <ssl/rand.h>
-# include <ssl/sha.h>
-#endif
+#include <openssl/rand.h>
+#include <openssl/sha.h>
 
-RCSID("$Id: entropy.c,v 1.4 2000/04/08 07:48:56 damien Exp $");
+RCSID("$Id: entropy.c,v 1.5 2000/04/16 02:31:50 damien Exp $");
 
 #ifdef EGD_SOCKET
 #ifndef offsetof
-- 
cgit v1.2.3