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 /auth-skey.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 'auth-skey.c')
-rw-r--r-- | auth-skey.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/auth-skey.c b/auth-skey.c index 056efeb9b..7eb32e8f2 100644 --- a/auth-skey.c +++ b/auth-skey.c | |||
@@ -1,17 +1,10 @@ | |||
1 | #include "includes.h" | 1 | #include "includes.h" |
2 | |||
3 | #ifdef SKEY | 2 | #ifdef SKEY |
4 | RCSID("$Id: auth-skey.c,v 1.6 2000/04/14 10:30:29 markus Exp $"); | 3 | RCSID("$Id: auth-skey.c,v 1.6 2000/04/14 10:30:29 markus Exp $"); |
5 | 4 | ||
6 | #include "ssh.h" | 5 | #include "ssh.h" |
7 | #include "packet.h" | 6 | #include "packet.h" |
8 | 7 | #include <sha1.h> | |
9 | #ifdef HAVE_OPENSSL | ||
10 | #include <openssl/sha.h> | ||
11 | #endif | ||
12 | #ifdef HAVE_SSL | ||
13 | #include <ssl/sha.h> | ||
14 | #endif | ||
15 | 8 | ||
16 | /* from %OpenBSD: skeylogin.c,v 1.32 1999/08/16 14:46:56 millert Exp % */ | 9 | /* from %OpenBSD: skeylogin.c,v 1.32 1999/08/16 14:46:56 millert Exp % */ |
17 | 10 | ||