summaryrefslogtreecommitdiffstats
path: root/sshsig.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:20:57 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:20:57 +0000
commitd1667913ba37d7f61712e06dd6dd4919fe36a053 (patch)
tree3b79bcd5316ce3cc395ffa0275b54faded8b2b92 /sshsig.c
parentReleasing progress-linux version 1:9.6p1-5~progress7.99u1. (diff)
downloadopenssh-d1667913ba37d7f61712e06dd6dd4919fe36a053.tar.xz
openssh-d1667913ba37d7f61712e06dd6dd4919fe36a053.zip
Merging upstream version 1:9.7p1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sshsig.c')
-rw-r--r--sshsig.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshsig.c b/sshsig.c
index d50d65f..470b286 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 */