From: djm <djm@openbsd.org>
Date: Fri, 8 Mar 2024 22:16:32 +0000 (+0000)
Subject: skip more whitespace, fixes find-principals on allowed_signers
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=186e249e5cad8050a3bcf0818131eb50149222d7;p=openbsd

skip more whitespace, fixes find-principals on allowed_signers
files with blank lines; reported by Wiktor Kwapisiewicz
---

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 */