8 Commits

Author	SHA1	Message	Date
Dag-Erling Smørgrav	989dd127e4	Forcibly revert to mainline.	2002-06-27 22:42:11 +00:00
Dag-Erling Smørgrav	af12a3e74a	Fix conflicts.	2002-03-18 10:09:43 +00:00
Brian Feldman	ca3176e7c8	Fix conflicts for OpenSSH 2.9.	2001-05-04 04:14:23 +00:00
Kris Kennaway	a09221f83c	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 Kennaway	c2d3a5594b	Resolve conflicts and update for OpenSSH 2.2.0 ... Reviewed by: gshapiro, peter, green	2000-09-10 09:35:38 +00:00
Kris Kennaway	e8aafc91b5	Resolve conflicts and update for FreeBSD.	2000-05-15 05:24:25 +00:00
Brian Feldman	18a711954e	The includes must be <openssl/.*\.h>, not <ssl/.*\.h>.	2000-02-25 01:53:12 +00:00
Mark Murray	511b41d2a1	Vendor import of OpenSSH.	2000-02-24 14:29:47 +00:00