diff options
| author | Damien Miller <djm@mindrot.org> | 2000-04-16 04:31:48 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-04-16 04:31:48 +0200 |
| commit | 5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7 (patch) | |
| tree | 443665fb58916f33c2f346aa3284a444d3352311 /packet.c | |
| parent | forgot -kb, remove openssl/ssl conditional (diff) | |
| download | openssh-5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7.tar.xz openssh-5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7.zip | |
- 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 @@ */ #include "includes.h" -RCSID("$Id: packet.c,v 1.18 2000/04/16 01:18:43 damien Exp $"); - -#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 */ +RCSID("$Id: packet.c,v 1.19 2000/04/16 02:31:51 damien Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -46,6 +35,9 @@ RCSID("$Id: packet.c,v 1.18 2000/04/16 01:18:43 damien Exp $"); #include "compat.h" #include "ssh2.h" +#include <openssl/bn.h> +#include <openssl/dh.h> +#include <openssl/hmac.h> #include "buffer.h" #include "kex.h" #include "hmac.h" |