svn commit: r194120 - projects/openssl_098_merge_8/secure/lib/libcrypto

[Simon L. Nielsen]

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