From owner-cvs-src@FreeBSD.ORG  Wed Mar 17 09:44:39 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8B9B916A4CE; Wed, 17 Mar 2004 09:44:39 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8632743D2F; Wed, 17 Mar 2004 09:44:39 -0800 (PST)
	(envelope-from nectar@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2HHidGe056847;
	Wed, 17 Mar 2004 09:44:39 -0800 (PST)
	(envelope-from nectar@repoman.freebsd.org)
Received: (from nectar@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2HHidgu056846;
	Wed, 17 Mar 2004 09:44:39 -0800 (PST)
	(envelope-from nectar)
Message-Id: <200403171744.i2HHidgu056846@repoman.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Wed, 17 Mar 2004 09:44:39 -0800 (PST)
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/evp evp.h src/crypto/openssl/crypto/idea
 Makefile.ssl src/crypto/openssl/ssl s2_clnt.c s2_enc.c s2_lib.c
 s2_pkt.c s2_srvr.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Mar 2004 17:44:39 -0000

nectar      2004/03/17 09:44:39 PST

  FreeBSD src repository

  Modified files:
    crypto/openssl/apps  openssl.cnf speed.c 
    crypto/openssl/crypto/evp evp.h 
    crypto/openssl/crypto/idea Makefile.ssl 
    crypto/openssl/ssl   s2_clnt.c s2_enc.c s2_lib.c s2_pkt.c 
                         s2_srvr.c 
  Log:
  Resolve conflicts after import of OpenSSL 0.9.7d.
  
  Revision  Changes    Path
  1.6       +6 -1      src/crypto/openssl/apps/openssl.cnf
  1.12      +7 -0      src/crypto/openssl/apps/speed.c
  1.13      +2 -0      src/crypto/openssl/crypto/evp/evp.h
  1.7       +1 -1      src/crypto/openssl/crypto/idea/Makefile.ssl
  1.12      +0 -1      src/crypto/openssl/ssl/s2_clnt.c
  1.9       +0 -1      src/crypto/openssl/ssl/s2_enc.c
  1.10      +2 -1      src/crypto/openssl/ssl/s2_lib.c
  1.9       +0 -1      src/crypto/openssl/ssl/s2_pkt.c
  1.11      +0 -1      src/crypto/openssl/ssl/s2_srvr.c