]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: sshsig: return "key not found" when searching empty files
authordjm@openbsd.org <djm@openbsd.org>
Sun, 28 Nov 2021 07:21:26 +0000 (07:21 +0000)
committerDamien Miller <djm@mindrot.org>
Sun, 28 Nov 2021 07:28:08 +0000 (18:28 +1100)
rather than "internal error"

OpenBSD-Commit-ID: e2ccae554c78d7a7cd33fc5d217f35be7e2507ed

sshsig.c

index 171e131716bea42316fcde51b63fa3b0b57bacaf..0dbae33a54517af86ce6994778ad2b8bd01a5fa7 100644 (file)
--- a/sshsig.c
+++ b/sshsig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshsig.c,v 1.25 2021/11/28 07:10:18 djm Exp $ */
+/* $OpenBSD: sshsig.c,v 1.26 2021/11/28 07:21:26 djm Exp $ */
 /*
  * Copyright (c) 2019 Google LLC
  *
@@ -1020,6 +1020,7 @@ sshsig_find_principals(const char *path, const struct sshkey *sign_key,
                return SSH_ERR_SYSTEM_ERROR;
        }
 
+       r = SSH_ERR_KEY_NOT_FOUND;
        while (getline(&line, &linesize, f) != -1) {
                linenum++;
                r = check_allowed_keys_line(path, linenum, line,