New upstream release (7.5p1)

1 files changed, 18 insertions, 5 deletions

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index add77136e..6dc5076ef 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.60 2016/11/30 02:57:40 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.62 2017/01/30 01:03:00 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -564,10 +564,13 @@ process_principals(FILE *f, char *file, struct passwd *pw,
 {
         char line[SSH_MAX_PUBKEY_BYTES], *cp, *ep, *line_opts;
         u_long linenum = 0;
-        u_int i;
+        u_int i, found_principal = 0;
 
         auth_start_parse_options();
         while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
+                /* Always consume entire input */
+                if (found_principal)
+                        continue;
                 /* Skip leading whitespace. */
                 for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
                         ;
@@ -600,11 +603,12 @@ process_principals(FILE *f, char *file, struct passwd *pw,
                                 if (auth_parse_options(pw, line_opts,
                                     file, linenum) != 1)
                                         continue;
-                                return 1;
+                                found_principal = 1;
+                                continue;
                         }
                 }
         }
-        return 0;
+        return found_principal;
 }
 
 static int
@@ -728,6 +732,9 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key)
 
         ok = process_principals(f, NULL, pw, cert);
 
+        fclose(f);
+        f = NULL;
+
         if (exited_cleanly(pid, "AuthorizedPrincipalsCommand", command) != 0)
                 goto out;
 
@@ -770,6 +777,9 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)
                 char *cp, *key_options = NULL, *fp = NULL;
                 const char *reason = NULL;
 
+                /* Always consume entrire file */
+                if (found_key)
+                        continue;
                 if (found != NULL)
                         key_free(found);
                 found = key_new(key_is_cert(key) ? KEY_UNSPEC : key->type);
@@ -856,7 +866,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)
                             file, linenum, key_type(found), fp);
                         free(fp);
                         found_key = 1;
-                        break;
+                        continue;
                 }
         }
         if (found != NULL)
@@ -1053,6 +1063,9 @@ user_key_command_allowed2(struct passwd *user_pw, Key *key)
 
         ok = check_authkeys_file(f, options.authorized_keys_command, key, pw);
 
+        fclose(f);
+        f = NULL;
+
         if (exited_cleanly(pid, "AuthorizedKeysCommand", command) != 0)
                 goto out;