1 files changed, 37 insertions, 33 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index 44c89e691..e2ea82656 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.224 2015/05/04 06:10:48 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.226 2015/07/30 00:01:34 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -188,18 +188,12 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
         }
 #endif
 
-        if (options.ciphers == (char *)-1) {
-                logit("No valid ciphers for protocol version 2 given, using defaults.");
-                options.ciphers = NULL;
-        }
-        if (options.ciphers != NULL) {
-                myproposal[PROPOSAL_ENC_ALGS_CTOS] =
-                myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
-        }
+        myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
+            options.kex_algorithms);
         myproposal[PROPOSAL_ENC_ALGS_CTOS] =
-            compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
+            compat_cipher_proposal(options.ciphers);
         myproposal[PROPOSAL_ENC_ALGS_STOC] =
-            compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
+            compat_cipher_proposal(options.ciphers);
         if (options.compression) {
                 myproposal[PROPOSAL_COMP_ALGS_CTOS] =
                 myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none";
@@ -207,23 +201,22 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
                 myproposal[PROPOSAL_COMP_ALGS_CTOS] =
                 myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib";
         }
-        if (options.macs != NULL) {
-                myproposal[PROPOSAL_MAC_ALGS_CTOS] =
-                myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
-        }
-        if (options.hostkeyalgorithms != NULL)
+        myproposal[PROPOSAL_MAC_ALGS_CTOS] =
+            myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
+        if (options.hostkeyalgorithms != NULL) {
+                if (kex_assemble_names(KEX_DEFAULT_PK_ALG,
+                    &options.hostkeyalgorithms) != 0)
+                        fatal("%s: kex_assemble_namelist", __func__);
                 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
                     compat_pkalg_proposal(options.hostkeyalgorithms);
-        else {
+        } else {
+                /* Enforce default */
+                options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG);
                 /* Prefer algorithms that we already have keys for */
                 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
                     compat_pkalg_proposal(
                     order_hostkeyalgs(host, hostaddr, port));
         }
-        if (options.kex_algorithms != NULL)
-                myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;
-        myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
-            myproposal[PROPOSAL_KEX_ALGS]);
 
 #ifdef GSSAPI
         /* If we've got GSSAPI algorithms, then we also support the
@@ -1431,6 +1424,26 @@ pubkey_cleanup(Authctxt *authctxt)
         }
 }
 
+static int
+try_identity(Identity *id)
+{
+        if (!id->key)
+                return (0);
+        if (match_pattern_list(sshkey_ssh_name(id->key),
+            options.pubkey_key_types, 0) != 1) {
+                debug("Skipping %s key %s for not in PubkeyAcceptedKeyTypes",
+                    sshkey_ssh_name(id->key), id->filename);
+                return (0);
+        }
+        if (key_type_plain(id->key->type) == KEY_RSA &&
+            (datafellows & SSH_BUG_RSASIGMD5) != 0) {
+                debug("Skipped %s key %s for RSA/MD5 server",
+                    key_type(id->key), id->filename);
+                return (0);
+        }
+        return (id->key->type != KEY_RSA1);
+}
+
 int
 userauth_pubkey(Authctxt *authctxt)
 {
@@ -1449,11 +1462,7 @@ userauth_pubkey(Authctxt *authctxt)
                  * private key instead
                  */
                 if (id->key != NULL) {
-                        if (key_type_plain(id->key->type) == KEY_RSA &&
-                            (datafellows & SSH_BUG_RSASIGMD5) != 0) {
-                                debug("Skipped %s key %s for RSA/MD5 server",
-                                    key_type(id->key), id->filename);
-                        } else if (id->key->type != KEY_RSA1) {
+                        if (try_identity(id)) {
                                 debug("Offering %s public key: %s",
                                     key_type(id->key), id->filename);
                                 sent = send_pubkey_test(authctxt, id);
@@ -1463,13 +1472,8 @@ userauth_pubkey(Authctxt *authctxt)
                         id->key = load_identity_file(id->filename,
                             id->userprovided);
                         if (id->key != NULL) {
-                                id->isprivate = 1;
-                                if (key_type_plain(id->key->type) == KEY_RSA &&
-                                    (datafellows & SSH_BUG_RSASIGMD5) != 0) {
-                                        debug("Skipped %s key %s for RSA/MD5 "
-                                            "server", key_type(id->key),
-                                            id->filename);
-                                } else {
+                                if (try_identity(id)) {
+                                        id->isprivate = 1;
                                         sent = sign_and_send_pubkey(
                                             authctxt, id);
                                 }