Date: Sat, 13 Mar 2010 23:39:04 +0100 From: "Simon L. Nielsen" <simon@FreeBSD.org> To: Doug Barton <dougb@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r205128 - in head: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/aes crypto/openssl/crypto/aes/asm crypto/openssl/crypto/asn1 crypto/openssl/crypto/bio ... Message-ID: <20100313223903.GE1316@frankie.nitro.dk> In-Reply-To: <4B9C114A.4020802@FreeBSD.org> References: <201003131922.o2DJMfY4010389@svn.freebsd.org> <4B9C114A.4020802@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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. -- Simon L. Nielsen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100313223903.GE1316>