On 03/13/10 14:39, Simon L. Nielsen wrote: > B0;251;0cOn 2010.03.13 14:27:22 -0800, Doug Barton wrote: >> On 03/13/10 11:22, Simon L. Nielsen wrote: >>> Author: simon >>> Date: Sat Mar 13 19:22:41 2010 >>> New Revision: 205128 >>> URL: http://svn.freebsd.org/changeset/base/205128 >>> >>> Log: >>> 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. >> >> The $FreeBSD$ on src/crypto/openssl/apps/openssl.cnf was useful for >> mergemaster purposes. Can we add it back? > > Sure, I missed that so I re-added it now.
Thanks! -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"