- stevesk@cvs.openbsd.org 2001/11/17 19:14:34
[auth2.c auth.c readconf.c servconf.c ssh-agent.c ssh-keygen.c]
enum/int type cleanup where it made sense to do so; ok markus@
diff --git a/ChangeLog b/ChangeLog
index 1cbe63d..24bf40c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
- markus@cvs.openbsd.org 2001/11/16 12:46:13
[ssh-keyscan.c]
handle empty lines instead of dumping core; report from sha@sha-1.net
+ - stevesk@cvs.openbsd.org 2001/11/17 19:14:34
+ [auth2.c auth.c readconf.c servconf.c ssh-agent.c ssh-keygen.c]
+ enum/int type cleanup where it made sense to do so; ok markus@
20011126
- (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
@@ -6928,4 +6931,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1668 2001/12/06 16:28:19 mouring Exp $
+$Id: ChangeLog,v 1.1669 2001/12/06 16:32:47 mouring Exp $
diff --git a/auth.c b/auth.c
index 2bf877d..a21ad41 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.29 2001/11/08 20:02:24 markus Exp $");
+RCSID("$OpenBSD: auth.c,v 1.30 2001/11/17 19:14:34 stevesk Exp $");
#ifdef HAVE_LOGIN_H
#include <login.h>
@@ -315,7 +315,7 @@
Key *found;
char *user_hostfile;
struct stat st;
- int host_status;
+ HostStatus host_status;
/* Check if we know the host and its host key. */
found = key_new(key->type);
diff --git a/auth2.c b/auth2.c
index 1920eb3..14d2125 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.72 2001/11/07 22:41:51 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.73 2001/11/17 19:14:34 stevesk Exp $");
#include <openssl/evp.h>
@@ -761,7 +761,8 @@
Key *key)
{
const char *resolvedname, *ipaddr, *lookup;
- int host_status, len;
+ HostStatus host_status;
+ int len;
resolvedname = get_canonical_hostname(options.reverse_mapping_check);
ipaddr = get_remote_ipaddr();
diff --git a/readconf.c b/readconf.c
index 63035b3..19fcfdd 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.91 2001/10/01 21:51:16 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.92 2001/11/17 19:14:34 stevesk Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -187,7 +187,7 @@
{ "smartcarddevice", oSmartcardDevice },
{ "clearallforwardings", oClearAllForwardings },
{ "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
- { NULL, 0 }
+ { NULL, oBadOption }
};
/*
diff --git a/servconf.c b/servconf.c
index e914d4c..9274c7e 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.91 2001/11/12 18:17:07 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.92 2001/11/17 19:14:34 stevesk Exp $");
#if defined(KRB4) || defined(KRB5)
#include <krb.h>
@@ -334,7 +334,7 @@
{ "clientalivecountmax", sClientAliveCountMax },
{ "authorizedkeysfile", sAuthorizedKeysFile },
{ "authorizedkeysfile2", sAuthorizedKeysFile2 },
- { NULL, 0 }
+ { NULL, sBadOption }
};
/*
diff --git a/ssh-agent.c b/ssh-agent.c
index a004e32..dbef400 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.73 2001/11/17 19:14:34 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.73 2001/11/17 19:14:34 stevesk Exp $");
#include <openssl/evp.h>
#include <openssl/md5.h>
@@ -61,11 +61,15 @@
#include "scard.h"
#endif
+typedef enum {
+ AUTH_UNUSED,
+ AUTH_SOCKET,
+ AUTH_CONNECTION
+} sock_type;
+
typedef struct {
int fd;
- enum {
- AUTH_UNUSED, AUTH_SOCKET, AUTH_CONNECTION
- } type;
+ sock_type type;
Buffer input;
Buffer output;
} SocketEntry;
@@ -627,7 +631,7 @@
}
static void
-new_socket(int type, int fd)
+new_socket(sock_type type, int fd)
{
u_int i, old_alloc;
if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 6d50997..a3f60cf 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.83 2001/10/25 21:14:32 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.84 2001/11/17 19:14:34 stevesk Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
@@ -534,7 +534,9 @@
FILE *f;
Key *public;
char *comment = NULL, *cp, *ep, line[16*1024], *fp;
- int i, skip = 0, num = 1, invalid = 1, rep, fptype;
+ int i, skip = 0, num = 1, invalid = 1;
+ enum fp_rep rep;
+ enum fp_type fptype;
struct stat st;
fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;