diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth.c | 4 | ||||
-rw-r--r-- | auth2.c | 5 | ||||
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | servconf.c | 4 | ||||
-rw-r--r-- | ssh-agent.c | 16 | ||||
-rw-r--r-- | ssh-keygen.c | 6 |
7 files changed, 27 insertions, 17 deletions
@@ -6,6 +6,9 @@ | |||
6 | - markus@cvs.openbsd.org 2001/11/16 12:46:13 | 6 | - markus@cvs.openbsd.org 2001/11/16 12:46:13 |
7 | [ssh-keyscan.c] | 7 | [ssh-keyscan.c] |
8 | handle empty lines instead of dumping core; report from sha@sha-1.net | 8 | handle empty lines instead of dumping core; report from sha@sha-1.net |
9 | - stevesk@cvs.openbsd.org 2001/11/17 19:14:34 | ||
10 | [auth2.c auth.c readconf.c servconf.c ssh-agent.c ssh-keygen.c] | ||
11 | enum/int type cleanup where it made sense to do so; ok markus@ | ||
9 | 12 | ||
10 | 20011126 | 13 | 20011126 |
11 | - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, | 14 | - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, |
@@ -6928,4 +6931,4 @@ | |||
6928 | - Wrote replacements for strlcpy and mkdtemp | 6931 | - Wrote replacements for strlcpy and mkdtemp |
6929 | - Released 1.0pre1 | 6932 | - Released 1.0pre1 |
6930 | 6933 | ||
6931 | $Id: ChangeLog,v 1.1668 2001/12/06 16:28:19 mouring Exp $ | 6934 | $Id: ChangeLog,v 1.1669 2001/12/06 16:32:47 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth.c,v 1.29 2001/11/08 20:02:24 markus Exp $"); | 26 | RCSID("$OpenBSD: auth.c,v 1.30 2001/11/17 19:14:34 stevesk Exp $"); |
27 | 27 | ||
28 | #ifdef HAVE_LOGIN_H | 28 | #ifdef HAVE_LOGIN_H |
29 | #include <login.h> | 29 | #include <login.h> |
@@ -315,7 +315,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host, | |||
315 | Key *found; | 315 | Key *found; |
316 | char *user_hostfile; | 316 | char *user_hostfile; |
317 | struct stat st; | 317 | struct stat st; |
318 | int host_status; | 318 | HostStatus host_status; |
319 | 319 | ||
320 | /* Check if we know the host and its host key. */ | 320 | /* Check if we know the host and its host key. */ |
321 | found = key_new(key->type); | 321 | found = key_new(key->type); |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.72 2001/11/07 22:41:51 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.73 2001/11/17 19:14:34 stevesk Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | 29 | ||
@@ -761,7 +761,8 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, | |||
761 | Key *key) | 761 | Key *key) |
762 | { | 762 | { |
763 | const char *resolvedname, *ipaddr, *lookup; | 763 | const char *resolvedname, *ipaddr, *lookup; |
764 | int host_status, len; | 764 | HostStatus host_status; |
765 | int len; | ||
765 | 766 | ||
766 | resolvedname = get_canonical_hostname(options.reverse_mapping_check); | 767 | resolvedname = get_canonical_hostname(options.reverse_mapping_check); |
767 | ipaddr = get_remote_ipaddr(); | 768 | ipaddr = get_remote_ipaddr(); |
diff --git a/readconf.c b/readconf.c index 63035b37f..19fcfdd3f 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.91 2001/10/01 21:51:16 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.92 2001/11/17 19:14:34 stevesk Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -187,7 +187,7 @@ static struct { | |||
187 | { "smartcarddevice", oSmartcardDevice }, | 187 | { "smartcarddevice", oSmartcardDevice }, |
188 | { "clearallforwardings", oClearAllForwardings }, | 188 | { "clearallforwardings", oClearAllForwardings }, |
189 | { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost }, | 189 | { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost }, |
190 | { NULL, 0 } | 190 | { NULL, oBadOption } |
191 | }; | 191 | }; |
192 | 192 | ||
193 | /* | 193 | /* |
diff --git a/servconf.c b/servconf.c index e914d4cee..9274c7e6c 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.91 2001/11/12 18:17:07 markus Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.92 2001/11/17 19:14:34 stevesk Exp $"); |
14 | 14 | ||
15 | #if defined(KRB4) || defined(KRB5) | 15 | #if defined(KRB4) || defined(KRB5) |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -334,7 +334,7 @@ static struct { | |||
334 | { "clientalivecountmax", sClientAliveCountMax }, | 334 | { "clientalivecountmax", sClientAliveCountMax }, |
335 | { "authorizedkeysfile", sAuthorizedKeysFile }, | 335 | { "authorizedkeysfile", sAuthorizedKeysFile }, |
336 | { "authorizedkeysfile2", sAuthorizedKeysFile2 }, | 336 | { "authorizedkeysfile2", sAuthorizedKeysFile2 }, |
337 | { NULL, 0 } | 337 | { NULL, sBadOption } |
338 | }; | 338 | }; |
339 | 339 | ||
340 | /* | 340 | /* |
diff --git a/ssh-agent.c b/ssh-agent.c index a004e3246..dbef400c4 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.73 2001/11/17 19:14:34 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $"); | 39 | RCSID("$OpenBSD: ssh-agent.c,v 1.73 2001/11/17 19:14:34 stevesk Exp $"); |
40 | 40 | ||
41 | #include <openssl/evp.h> | 41 | #include <openssl/evp.h> |
42 | #include <openssl/md5.h> | 42 | #include <openssl/md5.h> |
@@ -61,11 +61,15 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $"); | |||
61 | #include "scard.h" | 61 | #include "scard.h" |
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | typedef enum { | ||
65 | AUTH_UNUSED, | ||
66 | AUTH_SOCKET, | ||
67 | AUTH_CONNECTION | ||
68 | } sock_type; | ||
69 | |||
64 | typedef struct { | 70 | typedef struct { |
65 | int fd; | 71 | int fd; |
66 | enum { | 72 | sock_type type; |
67 | AUTH_UNUSED, AUTH_SOCKET, AUTH_CONNECTION | ||
68 | } type; | ||
69 | Buffer input; | 73 | Buffer input; |
70 | Buffer output; | 74 | Buffer output; |
71 | } SocketEntry; | 75 | } SocketEntry; |
@@ -627,7 +631,7 @@ process_message(SocketEntry *e) | |||
627 | } | 631 | } |
628 | 632 | ||
629 | static void | 633 | static void |
630 | new_socket(int type, int fd) | 634 | new_socket(sock_type type, int fd) |
631 | { | 635 | { |
632 | u_int i, old_alloc; | 636 | u_int i, old_alloc; |
633 | if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) | 637 | if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 6d509972f..a3f60cf01 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.83 2001/10/25 21:14:32 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.84 2001/11/17 19:14:34 stevesk Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -534,7 +534,9 @@ do_fingerprint(struct passwd *pw) | |||
534 | FILE *f; | 534 | FILE *f; |
535 | Key *public; | 535 | Key *public; |
536 | char *comment = NULL, *cp, *ep, line[16*1024], *fp; | 536 | char *comment = NULL, *cp, *ep, line[16*1024], *fp; |
537 | int i, skip = 0, num = 1, invalid = 1, rep, fptype; | 537 | int i, skip = 0, num = 1, invalid = 1; |
538 | enum fp_rep rep; | ||
539 | enum fp_type fptype; | ||
538 | struct stat st; | 540 | struct stat st; |
539 | 541 | ||
540 | fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; | 542 | fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; |