kentpeacock / rpms / openssh

Forked from rpms/openssh 2 years ago
Clone
1d31ef
diff -up openssh-7.4p1/kex.c.sha2 openssh-7.4p1/kex.c
1d31ef
--- openssh-7.4p1/kex.c.sha2	2017-02-17 18:15:53.589835864 +0100
1d31ef
+++ openssh-7.4p1/kex.c	2017-02-17 18:17:20.404781663 +0100
1d31ef
@@ -379,21 +379,14 @@ static int
1d31ef
 kex_send_ext_info(struct ssh *ssh)
1d31ef
 {
1d31ef
 	int r;
1d31ef
-	char *algs;
1d31ef
 
1d31ef
-	if ((algs = sshkey_alg_list(0, 1, ',')) == NULL)
1d31ef
-		return SSH_ERR_ALLOC_FAIL;
1d31ef
 	if ((r = sshpkt_start(ssh, SSH2_MSG_EXT_INFO)) != 0 ||
1d31ef
 	    (r = sshpkt_put_u32(ssh, 1)) != 0 ||
1d31ef
 	    (r = sshpkt_put_cstring(ssh, "server-sig-algs")) != 0 ||
1d31ef
-	    (r = sshpkt_put_cstring(ssh, algs)) != 0 ||
1d31ef
+	    (r = sshpkt_put_cstring(ssh, "rsa-sha2-256,rsa-sha2-512")) != 0 ||
1d31ef
 	    (r = sshpkt_send(ssh)) != 0)
1d31ef
-		goto out;
1d31ef
-	/* success */
1d31ef
-	r = 0;
1d31ef
- out:
1d31ef
-	free(algs);
1d31ef
-	return r;
1d31ef
+		return r;
1d31ef
+	return 0;
1d31ef
 }
1d31ef
 
1d31ef
 int