From owner-cvs-all@FreeBSD.ORG  Fri Feb 25 05:49:44 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 67F7616A4CE; Fri, 25 Feb 2005 05:49:44 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4610D43D46; Fri, 25 Feb 2005 05:49:44 +0000 (GMT)
	(envelope-from nectar@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1P5ni2K030151;
	Fri, 25 Feb 2005 05:49:44 GMT
	(envelope-from nectar@repoman.freebsd.org)
Received: (from nectar@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1P5ni4G030150;
	Fri, 25 Feb 2005 05:49:44 GMT
	(envelope-from nectar)
Message-Id: <200502250549.j1P5ni4G030150@repoman.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Fri, 25 Feb 2005 05:49:44 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/crypto/openssl/apps openssl.cnf speed.c
 src/crypto/openssl/crypto/des des.h src/crypto/openssl/crypto/err
 err_all.c src/crypto/openssl/crypto/evp evp.h
 src/crypto/openssl/crypto/rsa rsa.h rsa_eay.c ...
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Feb 2005 05:49:44 -0000

nectar      2005-02-25 05:49:44 UTC

  FreeBSD src repository

  Modified files:
    crypto/openssl/apps  openssl.cnf speed.c 
    crypto/openssl/crypto/des des.h 
    crypto/openssl/crypto/err err_all.c 
    crypto/openssl/crypto/evp evp.h 
    crypto/openssl/crypto/rsa rsa.h rsa_eay.c 
    crypto/openssl/ssl   s23_clnt.c s2_clnt.c s2_srvr.c 
    crypto/openssl/util/pl Mingw32.pl 
  Log:
  Resolve conflicts after import of OpenSSL 0.9.7e.
  
  Revision  Changes    Path
  1.7       +3 -3      src/crypto/openssl/apps/openssl.cnf
  1.13      +1 -0      src/crypto/openssl/apps/speed.c
  1.10      +5 -1      src/crypto/openssl/crypto/des/des.h
  1.8       +4 -0      src/crypto/openssl/crypto/err/err_all.c
  1.14      +39 -11    src/crypto/openssl/crypto/evp/evp.h
  1.11      +5 -1      src/crypto/openssl/crypto/rsa/rsa.h
  1.13      +2 -2      src/crypto/openssl/crypto/rsa/rsa_eay.c
  1.8       +5 -2      src/crypto/openssl/ssl/s23_clnt.c
  1.13      +5 -2      src/crypto/openssl/ssl/s2_clnt.c
  1.12      +6 -3      src/crypto/openssl/ssl/s2_srvr.c
  1.7       +9 -4      src/crypto/openssl/util/pl/Mingw32.pl