From owner-cvs-all  Sat Jan 26 19:17:27 2002
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6BF1437B416; Sat, 26 Jan 2002 19:17:13 -0800 (PST)
Received: (from kris@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g0R3HDh14980;
	Sat, 26 Jan 2002 19:17:13 -0800 (PST)
	(envelope-from kris)
Message-Id: <200201270317.g0R3HDh14980@freefall.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Sat, 26 Jan 2002 19:17:13 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/openssl/crypto/evp evp.h src/crypto/openssl/crypto/rsa
         rsa.h rsa_eay.c src/crypto/openssl/ssl s23_clnt.c s23_srvr.c
         s2_clnt.c s2_enc.c s2_pkt.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

kris        2002/01/26 19:17:13 PST

  Modified files:
    crypto/openssl/crypto/evp evp.h 
    crypto/openssl/crypto/rsa rsa.h rsa_eay.c 
    crypto/openssl/ssl   s23_clnt.c s23_srvr.c s2_clnt.c s2_enc.c 
                         s2_pkt.c s2_srvr.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.9       +2 -4      src/crypto/openssl/crypto/evp/evp.h
  1.7       +3 -4      src/crypto/openssl/crypto/rsa/rsa.h
  1.7       +32 -3     src/crypto/openssl/crypto/rsa/rsa_eay.c
  1.6       +2 -2      src/crypto/openssl/ssl/s23_clnt.c
  1.6       +81 -12    src/crypto/openssl/ssl/s23_srvr.c
  1.7       +89 -22    src/crypto/openssl/ssl/s2_clnt.c
  1.6       +3 -3      src/crypto/openssl/ssl/s2_enc.c
  1.7       +38 -21    src/crypto/openssl/ssl/s2_pkt.c
  1.7       +120 -22   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