From owner-cvs-all  Sun Apr 16 10:47:24 2000
Delivered-To: cvs-all@freebsd.org
Received: from internat.freebsd.org (internat.freebsd.org [146.64.8.4])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9C36137B904; Sun, 16 Apr 2000 10:47:16 -0700 (PDT)
	(envelope-from markm@internat.freebsd.org)
Received: (from markm@localhost)
	by internat.freebsd.org (8.9.3/8.9.3) id TAA70430;
	Sun, 16 Apr 2000 19:47:14 +0200 (SAST)
	(envelope-from markm)
Message-Id: <200004161747.TAA70430@internat.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 16 Apr 2000 19:47:13 +0200 (SAST)
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

markm       2000/04/16 19:47:12 SAST

FreeBSD International Crypto Repository

  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 
    crypto/openssl/util/pl Mingw32.pl 
  Log:
  Merge conflicts, catch up with FF.
  
  Revision  Changes    Path
  1.4       +41 -25    src/crypto/openssl/apps/speed.c
  1.3       +27 -9     src/crypto/openssl/crypto/des/des.h
  1.3       +2 -0      src/crypto/openssl/crypto/err/err_all.c
  1.3       +33 -10    src/crypto/openssl/crypto/evp/evp.h
  1.4       +28 -8     src/crypto/openssl/crypto/rsa/rsa.h
  1.3       +14 -10    src/crypto/openssl/crypto/rsa/rsa_lib.c
  1.3       +2 -1      src/crypto/openssl/rsaref/rsar_err.c
  1.3       +8 -1      src/crypto/openssl/rsaref/rsaref.c
  1.3       +7 -6      src/crypto/openssl/ssl/s23_clnt.c
  1.3       +6 -3      src/crypto/openssl/ssl/s23_lib.c
  1.3       +96 -38    src/crypto/openssl/ssl/s23_srvr.c
  1.3       +47 -26    src/crypto/openssl/ssl/s2_clnt.c
  1.3       +6 -2      src/crypto/openssl/ssl/s2_enc.c
  1.3       +78 -20    src/crypto/openssl/ssl/s2_lib.c
  1.3       +7 -1      src/crypto/openssl/ssl/s2_meth.c
  1.3       +6 -2      src/crypto/openssl/ssl/s2_pkt.c
  1.3       +14 -7     src/crypto/openssl/ssl/s2_srvr.c
  1.2       +1 -0      src/crypto/openssl/util/pl/Mingw32.pl



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