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

- djm@cvs.openbsd.org 2010/05/20 11:25:26 

[auth2-pubkey.c]
     fix logspam when key options (from="..." especially) deny non-matching
     keys; reported by henning@ also bz#1765; ok markus@ dtucker@
This commit is contained in:
Damien Miller 2010-05-21 14:58:12 +10:00
parent 388f6fc485
commit 84399555f0
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -29,6 +29,10 @@
use with use with
LPORT=`ssh -S muxsocket -R0:localhost:25 -O forward somehost` LPORT=`ssh -S muxsocket -R0:localhost:25 -O forward somehost`
feedback and ok djm@ feedback and ok djm@
- djm@cvs.openbsd.org 2010/05/20 11:25:26
[auth2-pubkey.c]
fix logspam when key options (from="..." especially) deny non-matching
keys; reported by henning@ also bz#1765; ok markus@ dtucker@
20100511 20100511
- (dtucker) [Makefile.in] Bug #1770: Link libopenbsd-compat twice to solve - (dtucker) [Makefile.in] Bug #1770: Link libopenbsd-compat twice to solve

18
auth2-pubkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-pubkey.c,v 1.24 2010/05/07 11:30:29 djm Exp $ */ /* $OpenBSD: auth2-pubkey.c,v 1.25 2010/05/20 11:25:26 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -291,13 +291,14 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
continue; continue;
} }
} }
if (auth_parse_options(pw, key_options, file, linenum) != 1)
continue;
if (key_is_cert(key)) { if (key_is_cert(key)) {
if (!key_is_cert_authority)
continue;
if (!key_equal(found, key->cert->signature_key)) if (!key_equal(found, key->cert->signature_key))
continue; continue;
if (auth_parse_options(pw, key_options, file,
linenum) != 1)
continue;
if (!key_is_cert_authority)
continue;
fp = key_fingerprint(found, SSH_FP_MD5, fp = key_fingerprint(found, SSH_FP_MD5,
SSH_FP_HEX); SSH_FP_HEX);
debug("matching CA found: file %s, line %lu, %s %s", debug("matching CA found: file %s, line %lu, %s %s",
@ -332,7 +333,12 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
xfree(fp); xfree(fp);
found_key = 1; found_key = 1;
break; break;
} else if (!key_is_cert_authority && key_equal(found, key)) { } else if (key_equal(found, key)) {
if (auth_parse_options(pw, key_options, file,
linenum) != 1)
continue;
if (key_is_cert_authority)
continue;
found_key = 1; found_key = 1;
debug("matching key found: file %s, line %lu", debug("matching key found: file %s, line %lu",
file, linenum); file, linenum);