From owner-cvs-all Wed Feb 19 15:24:18 2003 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 3F60E37B401; Wed, 19 Feb 2003 15:24:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C973C43F75; Wed, 19 Feb 2003 15:24:16 -0800 (PST) (envelope-from nectar@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1JNOG0U031046; Wed, 19 Feb 2003 15:24:16 -0800 (PST) (envelope-from nectar@repoman.freebsd.org) Received: (from nectar@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1JNOGgv031045; Wed, 19 Feb 2003 15:24:16 -0800 (PST) Message-Id: <200302192324.h1JNOGgv031045@repoman.freebsd.org> From: Jacques Vidrine Date: Wed, 19 Feb 2003 15:24:16 -0800 (PST) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssl/apps speed.c src/crypto/openssl/crypto/err err_all.c src/crypto/openssl/crypto/rsa rsa_eay.c rsa_lib.c src/crypto/openssl/ssl s2_clnt.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG nectar 2003/02/19 15:24:16 PST Modified files: crypto/openssl/apps speed.c crypto/openssl/crypto/err err_all.c crypto/openssl/crypto/rsa rsa_eay.c rsa_lib.c crypto/openssl/ssl s2_clnt.c Log: Resolve conflicts after import of OpenSSL 0.9.7a. Revision Changes Path 1.11 +10 -0 src/crypto/openssl/apps/speed.c 1.7 +4 -0 src/crypto/openssl/crypto/err/err_all.c 1.10 +2 -0 src/crypto/openssl/crypto/rsa/rsa_eay.c 1.8 +10 -0 src/crypto/openssl/crypto/rsa/rsa_lib.c 1.11 +1 -1 src/crypto/openssl/ssl/s2_clnt.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message