MFC: r331627

Merge OpenSSL 1.0.2o.

MFC: r312825

Merge OpenSSL 1.0.2k.

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.2h.

Relnotes: yes

Merge OpenSSL 1.0.2g.

Relnotes: yes

Merge OpenSSL 1.0.2d.

Merge OpenSSL 1.0.1m.

Merge OpenSSL 1.0.1j.

Merge OpenSSL 1.0.1i.

Merge OpenSSL 1.0.1c.

Approved by: benl (maintainer)

Resolve conflicts after import of OpenSSL 0.9.8e.

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.7d.

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

Resolve conflicts.

Resolve conflicts after import of OpenSSL 0.9.6e.

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.

Fix breakage when NO_RSA specified.

Reviewed by: Ben Laurie <ben@openssl.org>

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.