From owner-cvs-all@FreeBSD.ORG  Sun Oct  1 07:46:17 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C88C616A403;
	Sun,  1 Oct 2006 07:46:17 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7C38243D6E;
	Sun,  1 Oct 2006 07:46:17 +0000 (GMT)
	(envelope-from simon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k917kHm2078958;
	Sun, 1 Oct 2006 07:46:17 GMT
	(envelope-from simon@repoman.freebsd.org)
Received: (from simon@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k917kHsT078957;
	Sun, 1 Oct 2006 07:46:17 GMT (envelope-from simon)
Message-Id: <200610010746.k917kHsT078957@repoman.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sun, 1 Oct 2006 07:46:16 +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/apps speed.c
 src/crypto/openssl/crypto/evp
 evp.h src/crypto/openssl/crypto/rsa rsa.h rsa_eay.c rsa_sign.c
 src/crypto/openssl/ssl s2_clnt.c s2_lib.c
 src/crypto/openssl/util/pl Mingw32.pl
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Oct 2006 07:46:17 -0000

simon       2006-10-01 07:46:16 UTC

  FreeBSD src repository

  Modified files:
    crypto/openssl/apps  speed.c 
    crypto/openssl/crypto/evp evp.h 
    crypto/openssl/crypto/rsa rsa.h rsa_eay.c rsa_sign.c 
    crypto/openssl/ssl   s2_clnt.c s2_lib.c 
    crypto/openssl/util/pl Mingw32.pl 
  Log:
  Resolve conflicts after import of OpenSSL 0.9.8d.
  
  Revision  Changes    Path
  1.15      +107 -6    src/crypto/openssl/apps/speed.c
  1.16      +25 -0     src/crypto/openssl/crypto/evp/evp.h
  1.13      +13 -1     src/crypto/openssl/crypto/rsa/rsa.h
  1.15      +85 -18    src/crypto/openssl/crypto/rsa/rsa_eay.c
  1.3       +1 -1      src/crypto/openssl/crypto/rsa/rsa_sign.c
  1.15      +2 -1      src/crypto/openssl/ssl/s2_clnt.c
  1.12      +1 -1      src/crypto/openssl/ssl/s2_lib.c
  1.9       +4 -2      src/crypto/openssl/util/pl/Mingw32.pl