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-pubkey.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-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 2b3ecb104..0fd27bb92 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.38 2013/06/21 00:34:49 djm Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.39 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 | * |
@@ -116,6 +116,12 @@ userauth_pubkey(Authctxt *authctxt) | |||
116 | "(received %d, expected %d)", key->type, pktype); | 116 | "(received %d, expected %d)", key->type, pktype); |
117 | goto done; | 117 | goto done; |
118 | } | 118 | } |
119 | if (key_type_plain(key->type) == KEY_RSA && | ||
120 | (datafellows & SSH_BUG_RSASIGMD5) != 0) { | ||
121 | logit("Refusing RSA key because client uses unsafe " | ||
122 | "signature scheme"); | ||
123 | goto done; | ||
124 | } | ||
119 | if (have_sig) { | 125 | if (have_sig) { |
120 | sig = packet_get_string(&slen); | 126 | sig = packet_get_string(&slen); |
121 | packet_check_eom(); | 127 | packet_check_eom(); |