提交 24828bca 编写于 作者: A andrew

8193255: Root Certificates should be stored in text format and assembled at build time

8235142: JDK-8193255 backport broke bootstrap with JDK 10
Reviewed-by: sgehwolf
上级 4adac28f
...@@ -4379,7 +4379,7 @@ VS_SDK_PLATFORM_NAME_2017= ...@@ -4379,7 +4379,7 @@ VS_SDK_PLATFORM_NAME_2017=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1579517558 DATE_WHEN_GENERATED=1580709484
############################################################################### ###############################################################################
# #
...@@ -19768,8 +19768,6 @@ fi ...@@ -19768,8 +19768,6 @@ fi
if test "x$with_cacerts_file" != x; then if test "x$with_cacerts_file" != x; then
CACERTS_FILE=$with_cacerts_file CACERTS_FILE=$with_cacerts_file
else
CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
fi fi
...@@ -389,8 +389,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], ...@@ -389,8 +389,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
[specify alternative cacerts file])]) [specify alternative cacerts file])])
if test "x$with_cacerts_file" != x; then if test "x$with_cacerts_file" != x; then
CACERTS_FILE=$with_cacerts_file CACERTS_FILE=$with_cacerts_file
else
CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
fi fi
AC_SUBST(CACERTS_FILE) AC_SUBST(CACERTS_FILE)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册