From owner-svn-src-all@FreeBSD.ORG Sun Mar 14 01:26:39 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBDCC1065670 for ; Sun, 14 Mar 2010 01:26:39 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 0C9F88FC1B for ; Sun, 14 Mar 2010 01:26:38 +0000 (UTC) Received: (qmail 4839 invoked by uid 399); 14 Mar 2010 01:26:38 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 14 Mar 2010 01:26:38 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4B9C3B4C.7060706@FreeBSD.org> Date: Sat, 13 Mar 2010 17:26:36 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.7) Gecko/20100218 Thunderbird/3.0.1 MIME-Version: 1.0 To: "Simon L. Nielsen" References: <201003131922.o2DJMfY4010389@svn.freebsd.org> <4B9C114A.4020802@FreeBSD.org> <20100313223903.GE1316@frankie.nitro.dk> In-Reply-To: <20100313223903.GE1316@frankie.nitro.dk> X-Enigmail-Version: 1.0.1 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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 ... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2010 01:26:40 -0000 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/