tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

don't record hostbased authentication hostkeys as user
 keys in test for multiple authentication with the same key

Upstream-ID: 26b368fa2cff481f47f37e01b8da1ae5b57b1adc
This commit is contained in:
djm@openbsd.org 2015-09-04 04:44:08 +00:00 committed by Damien Miller
parent ac3451dd65
commit f54d8ac247
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monitor.c
View File

@ -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 <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -1444,7 +1444,7 @@ mm_answer_keyverify(int sock, Buffer *m)
__func__, key, (verified == 1) ? "verified" : "unverified"); __func__, key, (verified == 1) ? "verified" : "unverified");
/* If auth was successful then record key to ensure it isn't reused */ /* 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); auth2_record_userkey(authctxt, key);
else else
key_free(key); key_free(key);