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 /cipher.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 'cipher.c')
-rw-r--r-- | cipher.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -12,18 +12,13 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$Id: cipher.c,v 1.19 2000/04/16 01:18:41 damien Exp $"); | 15 | RCSID("$Id: cipher.c,v 1.20 2000/04/16 02:31:50 damien Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "cipher.h" | 18 | #include "cipher.h" |
19 | #include "xmalloc.h" | 19 | #include "xmalloc.h" |
20 | 20 | ||
21 | #ifdef HAVE_OPENSSL | ||
22 | #include <openssl/md5.h> | 21 | #include <openssl/md5.h> |
23 | #endif | ||
24 | #ifdef HAVE_SSL | ||
25 | #include <ssl/md5.h> | ||
26 | #endif | ||
27 | 22 | ||
28 | /* | 23 | /* |
29 | * This is used by SSH1: | 24 | * This is used by SSH1: |