- 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@

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 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.38 2013/06/21 00:34:49 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.39 2013/12/30 23:52:27 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -116,6 +116,12 @@ userauth_pubkey(Authctxt *authctxt)
                     "(received %d, expected %d)", key->type, pktype);
                 goto done;
         }
+        if (key_type_plain(key->type) == KEY_RSA &&
+            (datafellows & SSH_BUG_RSASIGMD5) != 0) {
+                logit("Refusing RSA key because client uses unsafe "
+                    "signature scheme");
+                goto done;
+        }
         if (have_sig) {
                 sig = packet_get_string(&slen);
                 packet_check_eom();