diff options
author | Damien Miller <djm@mindrot.org> | 2013-12-31 12:25:40 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-12-31 12:25:40 +1100 |
commit | 324541e5264e1489ca0babfaf2b39612eb80dfb3 (patch) | |
tree | 3adbfd162c3704e6aeb36f30ca09e4c04fbd25e2 /auth2-hostbased.c | |
parent | 9f4c8e797ea002a883307ca906f1f1f815010e78 (diff) |
- djm@cvs.openbsd.org 2013/12/30 23:52:28
[auth2-hostbased.c auth2-pubkey.c compat.c compat.h ssh-rsa.c]
[sshconnect.c sshconnect2.c sshd.c]
refuse RSA keys from old proprietary clients/servers that use the
obsolete RSA+MD5 signature scheme. it will still be possible to connect
with these clients/servers but only DSA keys will be accepted, and we'll
deprecate them entirely in a future release. ok markus@
Diffstat (limited to 'auth2-hostbased.c')
-rw-r--r-- | auth2-hostbased.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/auth2-hostbased.c b/auth2-hostbased.c index a344dcc1f..488008f62 100644 --- a/auth2-hostbased.c +++ b/auth2-hostbased.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-hostbased.c,v 1.16 2013/06/21 00:34:49 djm Exp $ */ | 1 | /* $OpenBSD: auth2-hostbased.c,v 1.17 2013/12/30 23:52:27 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -100,6 +100,12 @@ userauth_hostbased(Authctxt *authctxt) | |||
100 | "(received %d, expected %d)", key->type, pktype); | 100 | "(received %d, expected %d)", key->type, pktype); |
101 | goto done; | 101 | goto done; |
102 | } | 102 | } |
103 | if (key_type_plain(key->type) == KEY_RSA && | ||
104 | (datafellows & SSH_BUG_RSASIGMD5) != 0) { | ||
105 | error("Refusing RSA key because peer uses unsafe " | ||
106 | "signature format"); | ||
107 | goto done; | ||
108 | } | ||
103 | service = datafellows & SSH_BUG_HBSERVICE ? "ssh-userauth" : | 109 | service = datafellows & SSH_BUG_HBSERVICE ? "ssh-userauth" : |
104 | authctxt->service; | 110 | authctxt->service; |
105 | buffer_init(&b); | 111 | buffer_init(&b); |