From owner-cvs-all  Thu Apr 13  0:15: 9 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6C1D137BC76; Thu, 13 Apr 2000 00:15:06 -0700 (PDT)
	(envelope-from kris@FreeBSD.org)
Received: (from kris@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id AAA43431;
	Thu, 13 Apr 2000 00:15:05 -0700 (PDT)
	(envelope-from kris@FreeBSD.org)
Message-Id: <200004130715.AAA43431@freefall.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Thu, 13 Apr 2000 00:15:05 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/openssl/apps 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_lib.c src/crypto/openssl/rsaref rsar_err.c rsaref.c ...
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

kris        2000/04/13 00:15:05 PDT

  Modified files:
    crypto/openssl/apps  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_lib.c 
    crypto/openssl/rsaref rsar_err.c rsaref.c 
    crypto/openssl/ssl   s23_clnt.c s23_lib.c s23_srvr.c s2_clnt.c 
                         s2_enc.c s2_lib.c s2_meth.c s2_pkt.c 
                         s2_srvr.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.4       +41 -25    src/crypto/openssl/apps/speed.c
  1.3       +28 -10    src/crypto/openssl/crypto/des/des.h
  1.3       +3 -1      src/crypto/openssl/crypto/err/err_all.c
  1.3       +34 -11    src/crypto/openssl/crypto/evp/evp.h
  1.4       +28 -8     src/crypto/openssl/crypto/rsa/rsa.h
  1.3       +15 -11    src/crypto/openssl/crypto/rsa/rsa_lib.c
  1.3       +3 -2      src/crypto/openssl/rsaref/rsar_err.c
  1.3       +9 -2      src/crypto/openssl/rsaref/rsaref.c
  1.3       +8 -7      src/crypto/openssl/ssl/s23_clnt.c
  1.3       +7 -4      src/crypto/openssl/ssl/s23_lib.c
  1.3       +97 -39    src/crypto/openssl/ssl/s23_srvr.c
  1.3       +48 -27    src/crypto/openssl/ssl/s2_clnt.c
  1.3       +7 -3      src/crypto/openssl/ssl/s2_enc.c
  1.3       +79 -21    src/crypto/openssl/ssl/s2_lib.c
  1.3       +8 -2      src/crypto/openssl/ssl/s2_meth.c
  1.3       +7 -3      src/crypto/openssl/ssl/s2_pkt.c
  1.3       +15 -8     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