[openssh-commits] [openssh] branch master updated: upstream: skip more whitespace, fixes find-principals on

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new cd82f752 upstream: skip more whitespace, fixes find-principals on
cd82f752 is described below

commit cd82f7526e0481720567ae41db7849ab1c27e27b
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Fri Mar 8 22:16:32 2024 +0000

    upstream: skip more whitespace, fixes find-principals on
    
    allowed_signers files with blank lines; reported by Wiktor Kwapisiewicz
    
    OpenBSD-Commit-ID: b3a22a2afd753d70766f34bc7f309c03706b5298
---
 sshsig.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sshsig.c b/sshsig.c
index d50d65fe..470b286a 100644
--- a/sshsig.c
+++ b/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
  *
@@ -746,7 +746,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 */
 

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.