diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-01-23 05:27:21 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-01-23 16:40:29 +1100 |
commit | 14b5c635d1190633b23ac3372379517fb645b0c2 (patch) | |
tree | 8ef70b4660b04ba6add4c314d52f84375cb16788 /sshconnect.c | |
parent | 7c77991f5de5d8475cbeb7cbb06d0c7d1611d7bb (diff) |
upstream commit
Drop compatibility hacks for some ancient SSH
implementations, including ssh.com <=2.* and OpenSSH <= 3.*.
These versions were all released in or before 2001 and predate the
final SSH RFCs. The hacks in question aren't necessary for RFC-
compliant SSH implementations.
ok markus@
OpenBSD-Commit-ID: 4be81c67db57647f907f4e881fb9341448606138
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sshconnect.c b/sshconnect.c index c25e192c8..0e195a31d 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.290 2018/01/23 05:17:04 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.291 2018/01/23 05:27:21 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -617,9 +617,6 @@ ssh_exchange_identification(int timeout_ms) | |||
617 | if (mismatch) | 617 | if (mismatch) |
618 | fatal("Protocol major versions differ: %d vs. %d", | 618 | fatal("Protocol major versions differ: %d vs. %d", |
619 | PROTOCOL_MAJOR_2, remote_major); | 619 | PROTOCOL_MAJOR_2, remote_major); |
620 | if ((datafellows & SSH_BUG_DERIVEKEY) != 0) | ||
621 | fatal("Server version \"%.100s\" uses unsafe key agreement; " | ||
622 | "refusing connection", remote_version); | ||
623 | if ((datafellows & SSH_BUG_RSASIGMD5) != 0) | 620 | if ((datafellows & SSH_BUG_RSASIGMD5) != 0) |
624 | logit("Server version \"%.100s\" uses unsafe RSA signature " | 621 | logit("Server version \"%.100s\" uses unsafe RSA signature " |
625 | "scheme; disabling use of RSA keys", remote_version); | 622 | "scheme; disabling use of RSA keys", remote_version); |