diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/request-rsa-sha2-cert-signatures.patch | 39 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/debian/patches/request-rsa-sha2-cert-signatures.patch b/debian/patches/request-rsa-sha2-cert-signatures.patch new file mode 100644 index 000000000..2c876be31 --- /dev/null +++ b/debian/patches/request-rsa-sha2-cert-signatures.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From d94226d4fcefbc398c5583e12b5d07ca33884ba4 Mon Sep 17 00:00:00 2001 | ||
2 | From: "djm@openbsd.org" <djm@openbsd.org> | ||
3 | Date: Thu, 27 Dec 2018 23:02:11 +0000 | ||
4 | Subject: upstream: Request RSA-SHA2 signatures for | ||
5 | |||
6 | rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms; ok markus@ | ||
7 | |||
8 | OpenBSD-Commit-ID: afc6f7ca216ccd821656d1c911d2a3deed685033 | ||
9 | |||
10 | Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=f429c1b2ef631f2855e51a790cf71761d752bbca | ||
11 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2944 | ||
12 | Bug-Debian: https://bugs.debian.org/923419 | ||
13 | Last-Update: 2019-02-28 | ||
14 | |||
15 | Patch-Name: request-rsa-sha2-cert-signatures.patch | ||
16 | --- | ||
17 | authfd.c | 8 +++++--- | ||
18 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/authfd.c b/authfd.c | ||
21 | index ecdd869ab..62cbf8c19 100644 | ||
22 | --- a/authfd.c | ||
23 | +++ b/authfd.c | ||
24 | @@ -327,10 +327,12 @@ ssh_free_identitylist(struct ssh_identitylist *idl) | ||
25 | static u_int | ||
26 | agent_encode_alg(const struct sshkey *key, const char *alg) | ||
27 | { | ||
28 | - if (alg != NULL && key->type == KEY_RSA) { | ||
29 | - if (strcmp(alg, "rsa-sha2-256") == 0) | ||
30 | + if (alg != NULL && sshkey_type_plain(key->type) == KEY_RSA) { | ||
31 | + if (strcmp(alg, "rsa-sha2-256") == 0 || | ||
32 | + strcmp(alg, "rsa-sha2-256-cert-v01@openssh.com") == 0) | ||
33 | return SSH_AGENT_RSA_SHA2_256; | ||
34 | - else if (strcmp(alg, "rsa-sha2-512") == 0) | ||
35 | + if (strcmp(alg, "rsa-sha2-512") == 0 || | ||
36 | + strcmp(alg, "rsa-sha2-512-cert-v01@openssh.com") == 0) | ||
37 | return SSH_AGENT_RSA_SHA2_512; | ||
38 | } | ||
39 | return 0; | ||
diff --git a/debian/patches/series b/debian/patches/series index 12358dcf0..a95dccaa6 100644 --- a/debian/patches/series +++ b/debian/patches/series | |||
@@ -29,3 +29,4 @@ sanitize-scp-filenames-via-snmprintf.patch | |||
29 | have-progressmeter-force-update-at-beginning-and-end-transfer.patch | 29 | have-progressmeter-force-update-at-beginning-and-end-transfer.patch |
30 | check-filenames-in-scp-client.patch | 30 | check-filenames-in-scp-client.patch |
31 | fix-key-type-check.patch | 31 | fix-key-type-check.patch |
32 | request-rsa-sha2-cert-signatures.patch | ||