# HG changeset patch
# User wetmore
# Date 1480986232 28800
# Node ID 57efda72d3ad0631a8794f529974ab2c3ae26ce8
# Parent  bf171114688b374503f18c4f3ebb2fe3ea909f59
8170157: Enable unlimited cryptographic policy by default in OracleJDK
8169335: Add a crypto policy fallback in case Security Property 'crypto.policy' does not exist
Reviewed-by: erikj, ihse, weijun, xuelei, coffeys

diff -r bf171114688b -r 57efda72d3ad common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Fri Dec 02 11:18:44 2016 -0800
+++ b/common/autoconf/generated-configure.sh	Mon Dec 05 17:03:52 2016 -0800
@@ -1967,8 +1967,8 @@
   --enable-debug          set the debug level to fastdebug (shorthand for
                           --with-debug-level=fastdebug) [disabled]
   --enable-headless-only  only build headless (no GUI) support [disabled]
-  --enable-unlimited-crypto
-                          Enable unlimited crypto policy [disabled]
+  --disable-unlimited-crypto
+                          Disable unlimited crypto policy [enabled]
   --disable-keep-packaged-modules
                           Do not keep packaged modules in jdk image [enable]
   --enable-static-build   enable static library build [disabled]
@@ -5082,7 +5082,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1480691844
+DATE_WHEN_GENERATED=1480714260
 
 ###############################################################################
 #
@@ -24229,7 +24229,7 @@
 if test "${enable_unlimited_crypto+set}" = set; then :
   enableval=$enable_unlimited_crypto;
 else
-  enable_unlimited_crypto=no
+  enable_unlimited_crypto=yes
 fi
 
   if test "x$enable_unlimited_crypto" = "xyes"; then
diff -r bf171114688b -r 57efda72d3ad common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Fri Dec 02 11:18:44 2016 -0800
+++ b/common/autoconf/jdk-options.m4	Mon Dec 05 17:03:52 2016 -0800
@@ -163,9 +163,9 @@
   AC_SUBST(CACERTS_FILE)
 
   # Enable or disable unlimited crypto
-  AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
-      [Enable unlimited crypto policy @<:@disabled@:>@])],,
-      [enable_unlimited_crypto=no])
+  AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--disable-unlimited-crypto],
+      [Disable unlimited crypto policy @<:@enabled@:>@])],,
+      [enable_unlimited_crypto=yes])
   if test "x$enable_unlimited_crypto" = "xyes"; then
     UNLIMITED_CRYPTO=true
   else