summaryrefslogtreecommitdiff
path: root/entropy.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-04-16 12:31:48 +1000
committerDamien Miller <djm@mindrot.org>2000-04-16 12:31:48 +1000
commit5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7 (patch)
tree443665fb58916f33c2f346aa3284a444d3352311 /entropy.c
parenta664e870f27e6dc2c73f393e95a229abc527e0e6 (diff)
- 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
Diffstat (limited to 'entropy.c')
-rw-r--r--entropy.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/entropy.c b/entropy.c
index f304e21c..549fe702 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