MFC: r331627

Merge OpenSSL 1.0.2o.

MFC: r326662

Merge OpenSSL 1.0.2n.

MFC: r325328

Merge OpenSSL 1.0.2m.

MFC: r312825

Merge OpenSSL 1.0.2k.

MFC: r306193

Merge OpenSSL 1.0.2u.

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Merge OpenSSL 1.0.2f.

Relnotes: yes

Merge OpenSSL 1.0.2d.

Merge OpenSSL 1.0.1m.

Merge OpenSSL 1.0.1k.

Merge OpenSSL 1.0.1e.

Approved by: secteam (simon), benl (silence)

Merge OpenSSL 1.0.1c.

Approved by: benl (maintainer)

Merge OpenSSL 0.9.8p into head.

Security: CVE-2010-3864
Security: http://www.openssl.org/news/secadv_20101116.txt

Merge OpenSSL 0.9.8n into head.

This fixes CVE-2010-0740 which only affected -CURRENT (OpenSSL 0.9.8m)
but not -STABLE branches.

I have not yet been able to find out if CVE-2010-0433 impacts FreeBSD.
This will be investigated further.

Security: CVE-2010-0433, CVE-2010-0740
Security: http://www.openssl.org/news/secadv_20100324.txt

Merge OpenSSL 0.9.8m into head.

This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL. The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.

MFC after: 3 weeks

Merge OpenSSL 0.9.8k into head.

Approved by: re

Prevent cross-site forgery attacks on lukemftpd(8) due to splitting
long commands into multiple requests. [09:01]

Fix incorrect OpenSSL checks for malformed signatures due to invalid
check of return value from EVP_VerifyFinal(), DSA_verify, and
DSA_do_verify. [09:02]

Security: FreeBSD-SA-09:01.lukemftpd
Security: FreeBSD-SA-09:02.openssl
Obtained from: NetBSD [SA-09:01]
Obtained from: OpenSSL Project [SA-09:02]
Approved by: so (simon)

Resolve conflicts after import of OpenSSL 0.9.8d.

Resolve conflicts after import of OpenSSL 0.9.8b.

Resolve conflicts after import of OpenSSL 0.9.7e.

Resolve conflicts after import of OpenSSL 0.9.7d.

Resolve conflicts after import of OpenSSL 0.9.7a.

Merge conflicts.
This is cunning doublespeak for "use vendor code".

Resolve conflicts after import of OpenSSL 0.9.6d.

Resolve conflicts

Resolve conflicts

Resolve conflicts, and garbage collect some local changes that are no
longer required

Forced commit. This is to try and help folks that used the international
crypto repo and have slightly different files but with the same version.
cvsup in 'checkout mode' has no trouble with this, but cvs can get really
silly about it.

Resolve conflicts.

Merge from internat.freebsd.org repo, minus change to rsa_eay.c (missing)

Reorganize and unify libcrypto's interface so that the RSA implementation
is chosen at runtime via dlopen().

This is a checkpoint and may require more tweaks still.

Fix for missing symbol in -DRSAref case.

This commit was generated by cvs2svn to compensate for changes in r55714,
which included commits to RCS files with non-trunk default branches.

Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
infringement reasons.