From f54d8ac2474b6fc3afa081cf759b48a6c89d3319 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 4 Sep 2015 04:44:08 +0000 Subject: upstream commit don't record hostbased authentication hostkeys as user keys in test for multiple authentication with the same key Upstream-ID: 26b368fa2cff481f47f37e01b8da1ae5b57b1adc --- monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index e912a89cf..0af23d650 100644 --- a/monitor.c +++ b/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.152 2015/09/02 07:51:12 jsg Exp $ */ +/* $OpenBSD: monitor.c,v 1.153 2015/09/04 04:44:08 djm Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -1444,7 +1444,7 @@ mm_answer_keyverify(int sock, Buffer *m) __func__, key, (verified == 1) ? "verified" : "unverified"); /* If auth was successful then record key to ensure it isn't reused */ - if (verified == 1) + if (verified == 1 && key_blobtype == MM_USERKEY) auth2_record_userkey(authctxt, key); else key_free(key); -- cgit v1.2.3