From owner-svn-src-all@FreeBSD.ORG Sat Mar 13 22:39:05 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 2D3AF106564A; Sat, 13 Mar 2010 22:39:05 +0000 (UTC) (envelope-from simon@nitro.dk) Received: from mx.nitro.dk (unknown [77.75.165.90]) by mx1.freebsd.org (Postfix) with ESMTP id E18A68FC12; Sat, 13 Mar 2010 22:39:04 +0000 (UTC) Received: from frankie.nitro.dk (unknown [192.168.3.39]) by mx.nitro.dk (Postfix) with ESMTP id 187D02D4895; Sat, 13 Mar 2010 22:39:04 +0000 (UTC) Received: by frankie.nitro.dk (Postfix, from userid 2000) id 0DCB7E04C0; Sat, 13 Mar 2010 23:39:04 +0100 (CET) Date: Sat, 13 Mar 2010 23:39:04 +0100 From: "Simon L. Nielsen" To: Doug Barton Message-ID: <20100313223903.GE1316@frankie.nitro.dk> References: <201003131922.o2DJMfY4010389@svn.freebsd.org> <4B9C114A.4020802@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4B9C114A.4020802@FreeBSD.org> User-Agent: Mutt/1.5.20 (2009-06-14) 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: Sat, 13 Mar 2010 22:39:05 -0000 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