From 160db17fc678ceb5e3fd4a7e006cc73866f484aa Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Wed, 3 Mar 2021 22:41:49 +0000 Subject: upstream: don't sshbuf_get_u32() into an enum; reported by goetze AT dovetail.com via bz3269 OpenBSD-Commit-ID: 99a30a8f1df9bd72be54e21eee5c56a0f050921a --- monitor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index f6d6efc1..a464fcc8 100644 --- a/monitor.c +++ b/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 * Copyright 2002 Markus Friedl @@ -159,7 +159,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; @@ -1157,7 +1157,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; @@ -1206,7 +1206,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; } } -- cgit v1.2.1