summaryrefslogtreecommitdiffstats
path: root/cipher.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 /cipher.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 'cipher.c')
-rw-r--r--cipher.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/cipher.c b/cipher.c
index edc50dcf..639c1abb 100644
--- a/cipher.c
+++ b/cipher.c
@@ -12,18 +12,13 @@
*/
#include "includes.h"
-RCSID("$Id: cipher.c,v 1.19 2000/04/16 01:18:41 damien Exp $");
+RCSID("$Id: cipher.c,v 1.20 2000/04/16 02:31:50 damien Exp $");
#include "ssh.h"
#include "cipher.h"
#include "xmalloc.h"
-#ifdef HAVE_OPENSSL
#include <openssl/md5.h>
-#endif
-#ifdef HAVE_SSL
-#include <ssl/md5.h>
-#endif
/*
* This is used by SSH1: