diff options
author | Damien Miller <djm@mindrot.org> | 2000-04-16 12:31:48 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-04-16 12:31:48 +1000 |
commit | 5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7 (patch) | |
tree | 443665fb58916f33c2f346aa3284a444d3352311 /entropy.c | |
parent | a664e870f27e6dc2c73f393e95a229abc527e0e6 (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.c | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -32,16 +32,10 @@ | |||
32 | #include "ssh.h" | 32 | #include "ssh.h" |
33 | #include "xmalloc.h" | 33 | #include "xmalloc.h" |
34 | 34 | ||
35 | #ifdef HAVE_OPENSSL | 35 | #include <openssl/rand.h> |
36 | # include <openssl/rand.h> | 36 | #include <openssl/sha.h> |
37 | # include <openssl/sha.h> | ||
38 | #endif | ||
39 | #ifdef HAVE_SSL | ||
40 | # include <ssl/rand.h> | ||
41 | # include <ssl/sha.h> | ||
42 | #endif | ||
43 | 37 | ||
44 | RCSID("$Id: entropy.c,v 1.4 2000/04/08 07:48:56 damien Exp $"); | 38 | RCSID("$Id: entropy.c,v 1.5 2000/04/16 02:31:50 damien Exp $"); |
45 | 39 | ||
46 | #ifdef EGD_SOCKET | 40 | #ifdef EGD_SOCKET |
47 | #ifndef offsetof | 41 | #ifndef offsetof |