From owner-svn-src-projects@FreeBSD.ORG Sat Jun 13 16:34:40 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CDB71065688; Sat, 13 Jun 2009 16:34:40 +0000 (UTC) (envelope-from simon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 299EA8FC19; Sat, 13 Jun 2009 16:34:40 +0000 (UTC) (envelope-from simon@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DGYeM1019001; Sat, 13 Jun 2009 16:34:40 GMT (envelope-from simon@svn.freebsd.org) Received: (from simon@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DGYd5I018995; Sat, 13 Jun 2009 16:34:39 GMT (envelope-from simon@svn.freebsd.org) Message-Id: <200906131634.n5DGYd5I018995@svn.freebsd.org> From: "Simon L. Nielsen" Date: Sat, 13 Jun 2009 16:34:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194120 - projects/openssl_098_merge_8/secure/lib/libcrypto X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jun 2009 16:34:41 -0000 Author: simon Date: Sat Jun 13 16:34:39 2009 New Revision: 194120 URL: http://svn.freebsd.org/changeset/base/194120 Log: jpake is marked experimental so disable it by default. Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile Sat Jun 13 16:29:05 2009 (r194119) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile Sat Jun 13 16:34:39 2009 (r194120) @@ -329,9 +329,9 @@ SRCS+= cms_lib.c cms_asn1.c cms_att.c cm cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c INCS+= cms.h -# jpake -SRCS+= jpake.c jpake_err.c -INCS+= jpake.h +# jpake - is marked experimental +#SRCS+= jpake.c jpake_err.c +#INCS+= jpake.h # seed SRCS+= seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h Sat Jun 13 16:29:05 2009 (r194119) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h Sat Jun 13 16:34:39 2009 (r194120) @@ -9,6 +9,10 @@ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +/* jpake is marked experimental in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_JPAKE +# define OPENSSL_NO_JPAKE +#endif /* The Kerberos 5 support is MIT-specific. */ #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h Sat Jun 13 16:29:05 2009 (r194119) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h Sat Jun 13 16:34:39 2009 (r194120) @@ -9,6 +9,10 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +/* jpake is marked experimental in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_JPAKE +# define OPENSSL_NO_JPAKE +#endif /* libgmp is not in the FreeBSD base system. */ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h Sat Jun 13 16:29:05 2009 (r194119) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h Sat Jun 13 16:34:39 2009 (r194120) @@ -9,6 +9,10 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +/* jpake is marked experimental in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_JPAKE +# define OPENSSL_NO_JPAKE +#endif /* libgmp is not in the FreeBSD base system. */ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h Sat Jun 13 16:29:05 2009 (r194119) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h Sat Jun 13 16:34:39 2009 (r194120) @@ -9,6 +9,10 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +/* jpake is marked experimental in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_JPAKE +# define OPENSSL_NO_JPAKE +#endif /* libgmp is not in the FreeBSD base system. */ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h Sat Jun 13 16:29:05 2009 (r194119) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h Sat Jun 13 16:34:39 2009 (r194120) @@ -9,6 +9,10 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +/* jpake is marked experimental in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_JPAKE +# define OPENSSL_NO_JPAKE +#endif /* libgmp is not in the FreeBSD base system. */ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP