History log of /freebsd-10.0-release/crypto/openssl/apps/openssl.cnf
Revision Date Author Comments
(<<< Hide modified files)
(Show modified files >>>)
# 259065 07-Dec-2013 gjb

- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

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

# 256281 10-Oct-2013 gjb

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

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


# 238405 12-Jul-2012 jkim

Merge OpenSSL 1.0.1c.

Approved by: benl (maintainer)


# 237657 27-Jun-2012 jkim

Merge OpenSSL 0.9.8x.

Reviewed by: stas
Approved by: benl (maintainer)
MFC after: 3 days


# 205137 13-Mar-2010 simon

Readd $FreeBSD$ to the OpenSSL config file as that's useful for
mergemaster.

Suggested by: dougb


# 205128 13-Mar-2010 simon

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


# 160817 29-Jul-2006 simon

Resolve conflicts after import of OpenSSL 0.9.8b.


# 142428 25-Feb-2005 nectar

Resolve conflicts after import of OpenSSL 0.9.7e.


# 127134 17-Mar-2004 nectar

Resolve conflicts after import of OpenSSL 0.9.7d.


# 124292 09-Jan-2004 nectar

Re-add the FreeBSD RCS keyword for the benefit of mergemaster.

PR: conf/50040
Requested by: Dimitry Andric <dim@xs4all.nl>


# 110007 28-Jan-2003 markm

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


# 67867 29-Oct-2000 dougb

The previous commit had the fascinating side effect of bringing the
openssl version 0.9.5a version of this file into RELENG_5. This is
a good thing, but should be documented.


# 67865 29-Oct-2000 dougb

Add a CVS Id tag


# 59192 13-Apr-2000 kris

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


# 59191 13-Apr-2000 kris

Initial import of OpenSSL 0.9.5a


# 55714 10-Jan-2000 kris

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