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 mergedhere.Additional commits post-branch will follow.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Merge OpenSSL 1.0.1m.
Merge OpenSSL 1.0.1c.Approved by: benl (maintainer)
Merge OpenSSL 0.9.8k into head.Approved by: re
Resolve conflicts after import of OpenSSL 0.9.8b.
Resolve conflicts after import of OpenSSL 0.9.7e.
Merge conflicts.This is cunning doublespeak for "use vendor code".
Resolve conflicts after import of OpenSSL 0.9.6e.
Protect names that are used elsewhere. This fixes WARNS=2 breakagein crypto telnet.
Resolve conflicts
Resolve conflicts, and garbage collect some local changes that are nolonger required
Forced commit. This is to try and help folks that used the internationalcrypto repo and have slightly different files but with the same version.cvsup in 'checkout mode' has no trouble with this, but cvs can get reallysilly about it.
Resolve conflicts.
Get this to the same level of functionality as old libdes.
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 patentinfringement reasons.