bmh10 / rpms / openssh

Forked from rpms/openssh 9 days ago
Clone

Blame SOURCES/openssh-8.0p1-keyscan-rsa-sha2.patch

aedd00
From 7250879c72d28275a53f2f220e49646c3e42ef18 Mon Sep 17 00:00:00 2001
aedd00
From: "djm@openbsd.org" <djm@openbsd.org>
aedd00
Date: Fri, 12 Jul 2019 04:08:39 +0000
aedd00
Subject: [PATCH] upstream: include SHA2-variant RSA key algorithms in KEX
aedd00
 proposal;
aedd00
aedd00
allows ssh-keyscan to harvest keys from servers that disable olde SHA1
aedd00
ssh-rsa. bz#3029 from Jakub Jelen
aedd00
aedd00
OpenBSD-Commit-ID: 9f95ebf76a150c2f727ca4780fb2599d50bbab7a
aedd00
---
aedd00
 ssh-keyscan.c | 9 +++++++--
aedd00
 1 file changed, 7 insertions(+), 2 deletions(-)
aedd00
aedd00
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
aedd00
index d95ba1b37..d383b57b9 100644
aedd00
--- a/ssh-keyscan.c
aedd00
+++ b/ssh-keyscan.c
aedd00
@@ -233,7 +233,12 @@ keygrab_ssh2(con *c)
aedd00
 		break;
aedd00
 	case KT_RSA:
aedd00
 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ?
aedd00
-		    "ssh-rsa-cert-v01@openssh.com" : "ssh-rsa";
aedd00
+		    "rsa-sha2-512-cert-v01@openssh.com,"
aedd00
+		    "rsa-sha2-256-cert-v01@openssh.com,"
aedd00
+		    "ssh-rsa-cert-v01@openssh.com" :
aedd00
+		    "rsa-sha2-512,"
aedd00
+		    "rsa-sha2-256,"
aedd00
+		    "ssh-rsa";
aedd00
 		break;
aedd00
 	case KT_ED25519:
aedd00
 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ?
aedd00