diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-10-11 03:48:04 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-10-12 09:43:30 +1100 |
| commit | 1a4a9cf80f5b92b9d1dadd0bfa8867c04d195391 (patch) | |
| tree | a8dafb5ee6765ee38dca0893ac0c1fd6b142d6c2 | |
| parent | dc8ddcdf1a95e011c263486c25869bb5bf4e30ec (diff) | |
| download | openssh-git-1a4a9cf80f5b92b9d1dadd0bfa8867c04d195391.tar.gz | |
upstream: don't send new-style rsa-sha2-*-cert-v01@openssh.com names to
older OpenSSH that can't handle them. spotted by Adam Eijdenberg; ok dtucker
OpenBSD-Commit-ID: 662bbc402e3d7c9b6c322806269698106a6ae631
| -rw-r--r-- | sshconnect2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 86a0254b..1675f393 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.287 2018/09/14 05:26:27 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.288 2018/10/11 03:48:04 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1088,7 +1088,8 @@ key_sig_algorithm(struct ssh *ssh, const struct sshkey *key) * newer (SHA2) algorithms. */ if (ssh == NULL || ssh->kex->server_sig_algs == NULL || - (key->type != KEY_RSA && key->type != KEY_RSA_CERT)) { + (key->type != KEY_RSA && key->type != KEY_RSA_CERT) || + (key->type == KEY_RSA_CERT && (datafellows & SSH_BUG_SIGTYPE))) { /* Filter base key signature alg against our configuration */ return match_list(sshkey_ssh_name(key), options.pubkey_key_types, NULL); |