New upstream release (7.9p1)

1 files changed, 9 insertions, 3 deletions

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 3d9f9af1f..2fb5950ea 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.84 2018/08/23 03:01:08 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.86 2018/09/20 03:28:06 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -137,7 +137,13 @@ userauth_pubkey(struct ssh *ssh)
                     __func__, sshkey_ssh_name(key));
                 goto done;
         }
-
+        if ((r = sshkey_check_cert_sigtype(key,
+            options.ca_sign_algorithms)) != 0) {
+                logit("%s: certificate signature algorithm %s: %s", __func__,
+                    (key->cert == NULL || key->cert->signature_type == NULL) ?
+                    "(null)" : key->cert->signature_type, ssh_err(r));
+                goto done;
+        }
         key_s = format_key(key);
         if (sshkey_is_cert(key))
                 ca_s = format_key(key->cert->signature_key);
@@ -177,7 +183,7 @@ userauth_pubkey(struct ssh *ssh)
                     (r = sshbuf_put_cstring(b, authctxt->service)) != 0 ||
                     (r = sshbuf_put_cstring(b, "publickey")) != 0 ||
                     (r = sshbuf_put_u8(b, have_sig)) != 0 ||
-                    (r = sshbuf_put_cstring(b, pkalg) != 0) ||
+                    (r = sshbuf_put_cstring(b, pkalg)) != 0 ||
                     (r = sshbuf_put_string(b, pkblob, blen)) != 0)
                         fatal("%s: build packet failed: %s",
                             __func__, ssh_err(r));