From owner-cvs-src@FreeBSD.ORG  Thu Mar 15 20:07:27 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AFDD116A401;
	Thu, 15 Mar 2007 20:07:27 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A016D13C459;
	Thu, 15 Mar 2007 20:07:27 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2FK7R45048843;
	Thu, 15 Mar 2007 20:07:27 GMT
	(envelope-from simon@repoman.freebsd.org)
Received: (from simon@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2FK7RDm048842;
	Thu, 15 Mar 2007 20:07:27 GMT (envelope-from simon)
Message-Id: <200703152007.l2FK7RDm048842@repoman.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Thu, 15 Mar 2007 20:07:27 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/crypto/openssl/crypto/engine eng_all.c eng_padlock.c
 src/crypto/openssl/crypto/err err_all.c src/crypto/openssl/crypto/evp
 evp.h src/crypto/openssl/crypto/idea i_ecb.c idea_lcl.h
 src/crypto/openssl/crypto/rsa rsa_lib.c src/crypto/openssl/ssl ...
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Mar 2007 20:07:27 -0000

simon       2007-03-15 20:07:27 UTC

  FreeBSD src repository

  Modified files:
    crypto/openssl/crypto/engine eng_all.c eng_padlock.c 
    crypto/openssl/crypto/err err_all.c 
    crypto/openssl/crypto/evp evp.h 
    crypto/openssl/crypto/idea i_ecb.c idea_lcl.h 
    crypto/openssl/crypto/rsa rsa_lib.c 
    crypto/openssl/ssl   s23_clnt.c s23_srvr.c s2_enc.c s2_lib.c 
  Log:
  Resolve conflicts after import of OpenSSL 0.9.8e.
  
  Revision  Changes    Path
  1.4       +7 -5      src/crypto/openssl/crypto/engine/eng_all.c
  1.4       +2 -2      src/crypto/openssl/crypto/engine/eng_padlock.c
  1.10      +0 -4      src/crypto/openssl/crypto/err/err_all.c
  1.17      +33 -29    src/crypto/openssl/crypto/evp/evp.h
  1.7       +1 -1      src/crypto/openssl/crypto/idea/i_ecb.c
  1.6       +1 -1      src/crypto/openssl/crypto/idea/idea_lcl.h
  1.12      +2 -2      src/crypto/openssl/crypto/rsa/rsa_lib.c
  1.10      +0 -1      src/crypto/openssl/ssl/s23_clnt.c
  1.10      +0 -1      src/crypto/openssl/ssl/s23_srvr.c
  1.11      +6 -3      src/crypto/openssl/ssl/s2_enc.c
  1.13      +1 -1      src/crypto/openssl/ssl/s2_lib.c