From owner-cvs-all  Tue Jul 30  6:58:56 2002
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 C99E137B400; Tue, 30 Jul 2002 06:58:53 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8B05143E3B; Tue, 30 Jul 2002 06:58:53 -0700 (PDT)
	(envelope-from nectar@FreeBSD.org)
Received: from freefall.freebsd.org (nectar@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UDwrJU080775;
	Tue, 30 Jul 2002 06:58:53 -0700 (PDT)
	(envelope-from nectar@freefall.freebsd.org)
Received: (from nectar@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UDwrDQ080774;
	Tue, 30 Jul 2002 06:58:53 -0700 (PDT)
Message-Id: <200207301358.g6UDwrDQ080774@freefall.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Tue, 30 Jul 2002 06:58:53 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/openssl/crypto/des des.h src/crypto/openssl/crypto/evp
         evp.h src/crypto/openssl/crypto/rsa rsa_eay.c
         src/crypto/openssl/ssl s2_clnt.c s2_lib.c s2_srvr.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

nectar      2002/07/30 06:58:53 PDT

  Modified files:
    crypto/openssl/crypto/des des.h 
    crypto/openssl/crypto/evp evp.h 
    crypto/openssl/crypto/rsa rsa_eay.c 
    crypto/openssl/ssl   s2_clnt.c s2_lib.c s2_srvr.c 
  Log:
  Resolve conflicts after import of OpenSSL 0.9.6e.
  
  Revision  Changes    Path
  1.8       +1 -1      src/crypto/openssl/crypto/des/des.h
  1.11      +1 -1      src/crypto/openssl/crypto/evp/evp.h
  1.8       +1 -1      src/crypto/openssl/crypto/rsa/rsa_eay.c
  1.8       +9 -2      src/crypto/openssl/ssl/s2_clnt.c
  1.7       +10 -2     src/crypto/openssl/ssl/s2_lib.c
  1.8       +15 -2     src/crypto/openssl/ssl/s2_srvr.c

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message