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 /packet.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 'packet.c')
-rw-r--r-- | packet.c | 16 |
1 files changed, 4 insertions, 12 deletions
@@ -17,18 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | RCSID("$Id: packet.c,v 1.18 2000/04/16 01:18:43 damien Exp $"); | 20 | RCSID("$Id: packet.c,v 1.19 2000/04/16 02:31:51 damien Exp $"); |
21 | |||
22 | #ifdef HAVE_OPENSSL | ||
23 | # include <openssl/bn.h> | ||
24 | # include <openssl/dh.h> | ||
25 | # include <openssl/hmac.h> | ||
26 | #endif /* HAVE_OPENSSL */ | ||
27 | #ifdef HAVE_SSL | ||
28 | # include <ssl/bn.h> | ||
29 | # include <ssl/dh.h> | ||
30 | # include <ssl/hmac.h> | ||
31 | #endif /* HAVE_SSL */ | ||
32 | 21 | ||
33 | #include "xmalloc.h" | 22 | #include "xmalloc.h" |
34 | #include "buffer.h" | 23 | #include "buffer.h" |
@@ -46,6 +35,9 @@ RCSID("$Id: packet.c,v 1.18 2000/04/16 01:18:43 damien Exp $"); | |||
46 | #include "compat.h" | 35 | #include "compat.h" |
47 | #include "ssh2.h" | 36 | #include "ssh2.h" |
48 | 37 | ||
38 | #include <openssl/bn.h> | ||
39 | #include <openssl/dh.h> | ||
40 | #include <openssl/hmac.h> | ||
49 | #include "buffer.h" | 41 | #include "buffer.h" |
50 | #include "kex.h" | 42 | #include "kex.h" |
51 | #include "hmac.h" | 43 | #include "hmac.h" |