From owner-cvs-all  Sat Feb 17 19:23:40 2001
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 E03A137B67D; Sat, 17 Feb 2001 19:23:31 -0800 (PST)
Received: (from kris@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f1I3NVk83343;
	Sat, 17 Feb 2001 19:23:31 -0800 (PST)
	(envelope-from kris)
Message-Id: <200102180323.f1I3NVk83343@freefall.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Sat, 17 Feb 2001 19:23:31 -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/idea
         Makefile.ssl src/crypto/openssl/crypto/rsa rsa_eay.c
         src/crypto/openssl/ssl s2_clnt.c s2_lib.c s2_pkt.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

kris        2001/02/17 19:23:31 PST

  Modified files:
    crypto/openssl/crypto/evp evp.h 
    crypto/openssl/crypto/idea Makefile.ssl 
    crypto/openssl/crypto/rsa rsa_eay.c 
    crypto/openssl/ssl   s2_clnt.c s2_lib.c s2_pkt.c 
  Log:
  Resolve conflicts
  
  Revision  Changes    Path
  1.7       +35 -3     src/crypto/openssl/crypto/evp/evp.h
  1.5       +3 -2      src/crypto/openssl/crypto/idea/Makefile.ssl
  1.5       +85 -18    src/crypto/openssl/crypto/rsa/rsa_eay.c
  1.6       +2 -1      src/crypto/openssl/ssl/s2_clnt.c
  1.6       +9 -3      src/crypto/openssl/ssl/s2_lib.c
  1.5       +119 -51   src/crypto/openssl/ssl/s2_pkt.c



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