===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshconnect2.c,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- src/usr.bin/ssh/sshconnect2.c	2018/07/03 13:07:58	1.273
+++ src/usr.bin/ssh/sshconnect2.c	2018/07/03 13:20:25	1.274
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.273 2018/07/03 13:07:58 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.274 2018/07/03 13:20:25 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -988,7 +988,7 @@
 static char *
 key_sig_algorithm(struct ssh *ssh, const struct sshkey *key)
 {
-	char *allowed, *oallowed, *cp, *alg = NULL;
+	char *allowed, *oallowed, *cp, *tmp, *alg = NULL;
 
 	/*
 	 * The signature algorithm will only differ from the key algorithm
@@ -1012,7 +1012,10 @@
 	while ((cp = strsep(&allowed, ",")) != NULL) {
 		if (sshkey_type_from_name(cp) != key->type)
 			continue;
-		alg = match_list(cp, ssh->kex->server_sig_algs, NULL);
+		tmp = match_list(sshkey_sigalg_by_name(cp), ssh->kex->server_sig_algs, NULL);
+		if (tmp != NULL)
+			alg = xstrdup(cp);
+		free(tmp);
 		if (alg != NULL)
 			break;
 	}