tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 01:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/05/10 05:46:46

Browse Source 
[authfile.c]
     despam debug() logs by detecting that we are trying to load a private key
     in key_try_load_public() and returning early; ok markus@
This commit is contained in:
Damien Miller 2011-05-15 08:50:32 +10:00
parent 555f3b856f
commit 3219824f2d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -62,6 +62,10 @@
a TTY is fatal. a TTY is fatal.
ok markus@ ok markus@
- djm@cvs.openbsd.org 2011/05/10 05:46:46
[authfile.c]
despam debug() logs by detecting that we are trying to load a private key
in key_try_load_public() and returning early; ok markus@
20110510 20110510
- (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix

5
authfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfile.c,v 1.88 2011/05/04 21:15:29 djm Exp $ */ /* $OpenBSD: authfile.c,v 1.89 2011/05/10 05:46:46 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -765,6 +765,9 @@ key_try_load_public(Key *k, const char *filename, char **commentp)
case '\0': case '\0':
continue; continue;
} }
/* Abort loading if this looks like a private key */
if (strncmp(cp, "-----BEGIN", 10) == 0)
break;
/* Skip leading whitespace. */ /* Skip leading whitespace. */
for (; *cp && (*cp == ' ' || *cp == '\t'); cp++) for (; *cp && (*cp == ' ' || *cp == '\t'); cp++)
; ;