--- old/makefiles/CompileNativeLibraries.gmk 2013-05-31 11:55:02.796554079 +0200 +++ new/makefiles/CompileNativeLibraries.gmk 2013-05-31 11:55:02.496501952 +0200 @@ -2583,21 +2583,22 @@ ########################################################################################## -BUILD_LIBKRB5_NAME:= -ifeq ($(OPENJDK_TARGET_OS), windows) +ifneq ($(BUILD_CRYPTO),no) + BUILD_LIBKRB5_NAME:= + ifeq ($(OPENJDK_TARGET_OS), windows) BUILD_LIBKRB5_NAME:=w2k_lsa_auth BUILD_LIBKRB5_SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5 BUILD_LIBKRB5_LIBS:=advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \ gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib -else ifeq ($(OPENJDK_TARGET_OS), macosx) + else ifeq ($(OPENJDK_TARGET_OS), macosx) BUILD_LIBKRB5_NAME:=osxkrb5 BUILD_LIBKRB5_SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/krb5 BUILD_LIBKRB5_LIBS:=-framework Kerberos -endif + endif -ifneq ($(BUILD_LIBKRB5_NAME),) -$(eval $(call SetupNativeCompilation,BUILD_LIBKRB5,\ + ifneq ($(BUILD_LIBKRB5_NAME),) + $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5,\ LIBRARY:=$(BUILD_LIBKRB5_NAME),\ OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ SRC:=$(BUILD_LIBKRB5_SRC),\ @@ -2617,7 +2618,8 @@ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkrb5,\ DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) -BUILD_LIBRARIES += $(BUILD_LIBKRB5) + BUILD_LIBRARIES += $(BUILD_LIBKRB5) + endif endif ########################################################################################## --- old/makefiles/CreateJars.gmk 2013-05-31 11:55:03.566687871 +0200 +++ new/makefiles/CreateJars.gmk 2013-05-31 11:55:03.266635748 +0200 @@ -540,7 +540,8 @@ SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar SUNJCE_PROVIDER_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunjce_provider.jar -$(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,,\ +ifneq ($(BUILD_CRYPTO),no) + $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,,\ SRCS:=$(JDK_OUTPUTDIR)/classes, \ SUFFIXES:=.class,\ INCLUDES:= com/sun/crypto/provider,\ @@ -548,7 +549,10 @@ MANIFEST:=$(JCE_MANIFEST), \ SKIP_METAINF := true)) -$(SUNJCE_PROVIDER_JAR_UNSIGNED): $(JCE_MANIFEST) + $(SUNJCE_PROVIDER_JAR_UNSIGNED): $(JCE_MANIFEST) + + JARS += $(SUNJCE_PROVIDER_JAR_UNSIGNED) +endif ifndef OPENJDK SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar @@ -560,14 +564,13 @@ $(install-file) endif -JARS += $(SUNJCE_PROVIDER_JAR_UNSIGNED) - ########################################################################################## JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar JCE_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/jce.jar -$(eval $(call SetupArchive,BUILD_JCE_JAR,,\ +ifneq ($(BUILD_CRYPTO),no) + $(eval $(call SetupArchive,BUILD_JCE_JAR,,\ SRCS:=$(JDK_OUTPUTDIR)/classes, \ SUFFIXES:=.class,\ INCLUDES:= javax/crypto sun/security/internal,\ @@ -575,101 +578,106 @@ MANIFEST:=$(JCE_MANIFEST), \ SKIP_METAINF := true)) -$(JCE_JAR_UNSIGNED): $(JCE_MANIFEST) + $(JCE_JAR_UNSIGNED): $(JCE_MANIFEST) + + JARS += $(JCE_JAR_UNSIGNED) +endif ifndef OPENJDK - JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar - $(JCE_JAR_DST) : $(JCE_JAR_SRC) + JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar + $(JCE_JAR_DST) : $(JCE_JAR_SRC) @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt jce.jar..." $(install-file) else - $(JCE_JAR_DST) : $(JCE_JAR_UNSIGNED) + $(JCE_JAR_DST) : $(JCE_JAR_UNSIGNED) $(install-file) endif -JARS += $(JCE_JAR_UNSIGNED) - ########################################################################################## US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar US_EXPORT_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/US_export_policy.jar -# -# TODO fix so that SetupArchive does not write files into SRCS -# then we don't need this extra copying -# -# NOTE: We currently do not place restrictions on our limited export -# policy. This was not a typo. -# -US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited -US_EXPORT_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/US_export_policy_jar.tmp +ifneq ($(BUILD_CRYPTO),no) + # + # TODO fix so that SetupArchive does not write files into SRCS + # then we don't need this extra copying -$(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/% + # NOTE: We currently do not place restrictions on our limited export + # policy. This was not a typo. + # + US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited + US_EXPORT_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/US_export_policy_jar.tmp + + $(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/% $(install-file) -US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy + US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy -$(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR,$(US_EXPORT_POLICY_JAR_DEPS),\ + $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR,$(US_EXPORT_POLICY_JAR_DEPS),\ SRCS:=$(US_EXPORT_POLICY_JAR_TMP), \ SUFFIXES:= .policy,\ JAR:=$(US_EXPORT_POLICY_JAR_UNSIGNED), \ EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \ SKIP_METAINF := true)) + JARS += $(US_EXPORT_POLICY_JAR_UNSIGNED) +endif + ifndef OPENJDK - $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar + $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar $(ECHO) $(LOG_INFO) Copying $(@F) $(install-file) else - $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNSIGNED) + $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNSIGNED) $(install-file) endif -JARS += $(US_EXPORT_POLICY_JAR_UNSIGNED) - ########################################################################################## LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar LOCAL_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/local_policy.jar -# -# TODO fix so that SetupArchive does not write files into SRCS -# then we don't need this extra copying -# -LOCAL_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/local_policy_jar.tmp +ifneq ($(BUILD_CRYPTO),no) + # + # TODO fix so that SetupArchive does not write files into SRCS + # then we don't need this extra copying + # + LOCAL_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/local_policy_jar.tmp -ifeq ($(UNLIMITED_CRYPTO), true) + ifeq ($(UNLIMITED_CRYPTO), true) LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited -else + else LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \ $(LOCAL_POLICY_JAR_TMP)/default_local.policy LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited -endif + endif -$(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/% + $(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/% $(install-file) -$(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR,$(LOCAL_POLICY_JAR_DEPS),\ + $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR,$(LOCAL_POLICY_JAR_DEPS),\ SRCS:=$(LOCAL_POLICY_JAR_TMP),\ SUFFIXES:= .policy,\ JAR:=$(LOCAL_POLICY_JAR_UNSIGNED), \ EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \ SKIP_METAINF := true)) + JARS += $(LOCAL_POLICY_JAR_UNSIGNED) +endif + ifndef OPENJDK - $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar + $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar $(ECHO) $(LOG_INFO) Copying $(@F) $(install-file) else - $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNSIGNED) + $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNSIGNED) $(install-file) endif -JARS += $(LOCAL_POLICY_JAR_UNSIGNED) - ########################################################################################## ifeq ($(OPENJDK_TARGET_OS),windows) --- old/makefiles/Import.gmk 2013-05-31 11:55:04.306816452 +0200 +++ new/makefiles/Import.gmk 2013-05-31 11:55:04.006764329 +0200 @@ -200,6 +200,46 @@ $(RM) $(basename $@).debuginfo $(MV) $@.tmp $@ -####### +########################################################################################## +# Unpack the binary distributions of the crypto classes if they exist. +SEC_FILES_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/sec-bin.zip +SEC_FILES_WIN_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/sec-windows-bin.zip +JGSS_WIN32_FILES_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip +JGSS_WIN64_FILES_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip + +define unzip-sec-file + $(ECHO) Unzipping $( $@.tmp) + $(MV) $@.tmp $@ +endef + +$(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped: $(SEC_FILES_ZIP) + $(call unzip-sec-file) + +$(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped: $(SEC_FILES_WIN_ZIP) + $(call unzip-sec-file) + +$(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped: $(JGSS_WIN32_FILES_ZIP) + $(call unzip-sec-file) + +$(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped: $(JGSS_WIN64_FILES_ZIP) + $(call unzip-sec-file) + +ifneq ($(wildcard $(SEC_FILES_ZIP)),) + IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped + ifeq ($(OPENJDK_TARGET_OS),windows) + IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped + ifeq ($(OPENJDK_TARGET_CPU),x86) + IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped + endif + ifeq ($(OPENJDK_TARGET_CPU),x86_64) + IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped + endif + endif +endif + +########################################################################################## all: $(IMPORT_TARGET_FILES) --- old/makefiles/Setup.gmk 2013-05-31 11:55:05.016939823 +0200 +++ new/makefiles/Setup.gmk 2013-05-31 11:55:04.706885956 +0200 @@ -35,12 +35,21 @@ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) +ifndef OPENJDK + # Some licensees do not get the Security Source bundles. We will + # fall back on the prebuilt jce.jar so that we can do a best + # attempt at building. + ifeq ($(wildcard $(JDK_TOPDIR)/src/share/classes/javax/crypto/Cipher.java),) + JCE_PATH := $(PATH_SEP)$(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar + endif +endif + # The generate new bytecode javac setup uses the new compiler to compile for the # new jdk. This new bytecode might only be possible to run using the new jvm. $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\ JVM:=$(JAVA),\ JAVAC:=$(NEW_JAVAC),\ - FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\ + FLAGS:=-bootclasspath "$(JDK_OUTPUTDIR)/classes$(JCE_PATH)" -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))