summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2024-03-08 22:16:33 +0000
committerDamien Miller <djm@cvs.openbsd.org>2024-03-08 22:16:33 +0000
commitf01292be2fd035d3c69ee452d37e06e29c07c5b1 (patch)
tree0e00c5942fc579b6b76f6fdca164273afd4e04dd /usr.bin/ssh
parentb44a8023f1e436455f11e7abdf9f592e5665f1a6 (diff)
skip more whitespace, fixes find-principals on allowed_signers
files with blank lines; reported by Wiktor Kwapisiewicz
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/sshsig.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshsig.c b/usr.bin/ssh/sshsig.c
index 268940b03c8..f4c33634481 100644
--- a/usr.bin/ssh/sshsig.c
+++ b/usr.bin/ssh/sshsig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshsig.c,v 1.34 2023/12/08 09:18:39 markus Exp $ */
+/* $OpenBSD: sshsig.c,v 1.35 2024/03/08 22:16:32 djm Exp $ */
/*
* Copyright (c) 2019 Google LLC
*
@@ -744,7 +744,7 @@ parse_principals_key_and_options(const char *path, u_long linenum, char *line,
*keyp = NULL;
cp = line;
- cp = cp + strspn(cp, " \t"); /* skip leading whitespace */
+ cp = cp + strspn(cp, " \t\n\r"); /* skip leading whitespace */
if (*cp == '#' || *cp == '\0')
return SSH_ERR_KEY_NOT_FOUND; /* blank or all-comment line */