summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2021-03-03 22:41:50 +0000
committerDamien Miller <djm@cvs.openbsd.org>2021-03-03 22:41:50 +0000
commit35f7c4c7655fabdfe06b2bf4279823e5025401e3 (patch)
tree53676bc413232f4ffdc9ca60decb316807c5c24e /usr.bin
parentd98772d721338af17074c5d5da730cdc028429c0 (diff)
don't sshbuf_get_u32() into an enum; reported by goetze AT
dovetail.com via bz3269
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/monitor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index 68158d57b03..b8fb848e578 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.223 2021/01/27 10:05:28 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.224 2021/03/03 22:41:49 djm Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -130,7 +130,7 @@ static Authctxt *authctxt;
/* local state for key verify */
static u_char *key_blob = NULL;
static size_t key_bloblen = 0;
-static int key_blobtype = MM_NOKEY;
+static u_int key_blobtype = MM_NOKEY;
static struct sshauthopt *key_opts = NULL;
static char *hostbased_cuser = NULL;
static char *hostbased_chost = NULL;
@@ -908,7 +908,7 @@ mm_answer_keyallowed(struct ssh *ssh, int sock, struct sshbuf *m)
struct sshkey *key = NULL;
char *cuser, *chost;
u_int pubkey_auth_attempt;
- enum mm_keytype type = 0;
+ u_int type = 0;
int r, allowed = 0;
struct sshauthopt *opts = NULL;
@@ -957,7 +957,7 @@ mm_answer_keyallowed(struct ssh *ssh, int sock, struct sshbuf *m)
cuser, chost);
break;
default:
- fatal_f("unknown key type %d", type);
+ fatal_f("unknown key type %u", type);
break;
}
}