des
4ff234ef46
Merge conflicts.
...
MFC after: 1 week
2006-09-30 13:38:06 +00:00
des
5ba29faa04
Forcibly revert to mainline.
2002-06-27 22:42:11 +00:00
des
6534271ec8
Fix conflicts.
2002-03-18 10:09:43 +00:00
green
119a11eb6b
Fix conflicts for OpenSSH 2.9.
2001-05-04 04:14:23 +00:00
kris
94cb603894
Patches backported from later development version of OpenSSH which prevent
...
(instead of just mitigating through connection limits) the Bleichenbacher
attack which can lead to guessing of the server key (not host key) by
regenerating it when an RSA failure is detected.
Reviewed by: rwatson
2001-02-12 06:44:51 +00:00
kris
24372e6c10
Resolve conflicts and update for OpenSSH 2.2.0
...
Reviewed by: gshapiro, peter, green
2000-09-10 09:35:38 +00:00
kris
a632b4789c
Resolve conflicts and update for FreeBSD.
2000-05-15 05:24:25 +00:00
green
129e6a7558
The includes must be <openssl/.*\.h>, not <ssl/.*\.h>.
2000-02-25 01:53:12 +00:00
markm
fc557ff7d9
Vendor import of OpenSSH.
2000-02-24 14:29:47 +00:00
