From owner-svn-src-projects@FreeBSD.ORG Sun Jun 14 09:54:17 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 02D51106566B; Sun, 14 Jun 2009 09:54:17 +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 E50F08FC12; Sun, 14 Jun 2009 09:54:16 +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 n5E9sGZD042415; Sun, 14 Jun 2009 09:54:16 GMT (envelope-from simon@svn.freebsd.org) Received: (from simon@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5E9sGkj042414; Sun, 14 Jun 2009 09:54:16 GMT (envelope-from simon@svn.freebsd.org) Message-Id: <200906140954.n5E9sGkj042414@svn.freebsd.org> From: "Simon L. Nielsen" Date: Sun, 14 Jun 2009 09:54:16 +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: r194182 - 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: Sun, 14 Jun 2009 09:54:17 -0000 Author: simon Date: Sun Jun 14 09:54:16 2009 New Revision: 194182 URL: http://svn.freebsd.org/changeset/base/194182 Log: Also disable jpake on arm. Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h Sun Jun 14 09:25:21 2009 (r194181) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h Sun Jun 14 09:54:16 2009 (r194182) @@ -21,6 +21,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