Merge
This commit is contained in:
Lana Steuck
commit
504c9ba234
jdk
make
src
demo/share/jvmti
java.base
share
classes
com/sun/security/cert/internal/x509
java
lang
nio/charset
security
acl
Acl.javaAclEntry.javaAclNotFoundException.javaGroup.javaLastOwnerException.javaNotOwnerException.javaOwner.javaPermission.javapackage-info.java
spec
time/format
util/regex
javax
net/ssl
security/cert
sun
misc
net/www/protocol/https
security/ssl
native
unix/native/launcher
windows/native/libnet
java.prefs
java.xml.crypto/share/classes/javax/xml/crypto/dsig
jdk.jartool/share/classes
com/sun/jarsigner
sun
security/tools/jarsigner
tools/jar
jdk.localedata/share/classes/sun/text/resources/fi
jdk.pack200/share/native/common-unpack
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -219,6 +219,9 @@ define SetupJVMTIDemo
|
||||
# Param 7 = libs for solaris
|
||||
# Param 8 = libs for linux
|
||||
# Param 9 = extra directories with required sources
|
||||
# Param 10 = DISABLED_WARNINGS_gcc
|
||||
# Param 11 = DISABLED_WARNINGS_microsoft
|
||||
# Param 12 = DISABLED_WARNINGS_clang
|
||||
BUILD_DEMO_JVMTI_$1_EXTRA_SRC := \
|
||||
$$(wildcard $(DEMO_OS_TYPE_SRC)/jvmti/$1) \
|
||||
$$(wildcard $$(addprefix $(DEMO_SHARE_SRC)/jvmti/, $2)) \
|
||||
@ -254,6 +257,9 @@ define SetupJVMTIDemo
|
||||
LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
|
||||
OPTIMIZATION := LOW, \
|
||||
CXXFLAGS := $$($1_CXXFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := $(10), \
|
||||
DISABLED_WARNINGS_clang := $(12), \
|
||||
DISABLED_WARNINGS_microsoft := $(11), \
|
||||
LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
|
||||
LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
|
||||
LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
|
||||
|
||||
@ -77,7 +77,7 @@ 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), \
|
||||
DEPENDENCIES := $(US_EXPORT_POLICY_JAR_DEPS), \
|
||||
SRCS := $(US_EXPORT_POLICY_JAR_TMP), \
|
||||
SUFFIXES := .policy, \
|
||||
JAR := $(US_EXPORT_POLICY_JAR_UNLIMITED), \
|
||||
@ -139,8 +139,8 @@ $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/%: \
|
||||
$(install-file)
|
||||
|
||||
$(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_LIMITED, \
|
||||
$(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \
|
||||
$(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy, \
|
||||
DEPENDENCIES := $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \
|
||||
$(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy, \
|
||||
SRCS := $(LOCAL_POLICY_JAR_LIMITED_TMP), \
|
||||
SUFFIXES := .policy, \
|
||||
JAR := $(LOCAL_POLICY_JAR_LIMITED), \
|
||||
@ -148,7 +148,7 @@ $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_LIMITED, \
|
||||
SKIP_METAINF := true))
|
||||
|
||||
$(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_UNLIMITED, \
|
||||
$(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy, \
|
||||
DEPENDENCIES := $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy, \
|
||||
SRCS := $(LOCAL_POLICY_JAR_UNLIMITED_TMP), \
|
||||
SUFFIXES := .policy, \
|
||||
JAR := $(LOCAL_POLICY_JAR_UNLIMITED), \
|
||||
|
||||
@ -32,8 +32,7 @@ include GensrcProperties.gmk
|
||||
$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, \
|
||||
$(JDK_TOPDIR)/src/jdk.dev/share/classes/jdk/tools/jimage/resources \
|
||||
$(JDK_TOPDIR)/src/jdk.dev/share/classes/sun/tools/jar/resources)), \
|
||||
$(JDK_TOPDIR)/src/jdk.dev/share/classes/jdk/tools/jimage/resources)), \
|
||||
ListResourceBundle))
|
||||
|
||||
TARGETS += $(COMPILE_PROPERTIES)
|
||||
|
||||
44
jdk/make/gensrc/Gensrc-jdk.jartool.gmk
Normal file
44
jdk/make/gensrc/Gensrc-jdk.jartool.gmk
Normal file
@ -0,0 +1,44 @@
|
||||
#
|
||||
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
include GensrcCommon.gmk
|
||||
|
||||
################################################################################
|
||||
|
||||
include GensrcProperties.gmk
|
||||
|
||||
$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, \
|
||||
$(JDK_TOPDIR)/src/jdk.jartool/share/classes/sun/tools/jar/resources)), \
|
||||
ListResourceBundle))
|
||||
|
||||
TARGETS += $(COMPILE_PROPERTIES)
|
||||
|
||||
################################################################################
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
.PHONY: all
|
||||
@ -25,18 +25,6 @@
|
||||
|
||||
include LauncherCommon.gmk
|
||||
|
||||
$(eval $(call SetupLauncher,jar, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,jarsigner, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }'))
|
||||
|
||||
ifndef BUILD_HEADLESS_ONLY
|
||||
$(eval $(call SetupLauncher,policytool, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \
|
||||
$(XLIBS)))
|
||||
endif
|
||||
|
||||
$(eval $(call SetupLauncher,jdeps, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
|
||||
|
||||
32
jdk/make/launcher/Launcher-jdk.jartool.gmk
Normal file
32
jdk/make/launcher/Launcher-jdk.jartool.gmk
Normal file
@ -0,0 +1,32 @@
|
||||
#
|
||||
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
include LauncherCommon.gmk
|
||||
|
||||
$(eval $(call SetupLauncher,jar, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,jarsigner, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }'))
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -32,9 +32,9 @@ $(eval $(call SetupLauncher,pack200, \
|
||||
# The order of the object files on the link command line affects the size of the resulting
|
||||
# binary (at least on linux) which causes the size to differ between old and new build.
|
||||
|
||||
UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
|
||||
$(JDK_TOPDIR)/src/jdk.runtime/share/native/unpack200
|
||||
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
|
||||
UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \
|
||||
$(JDK_TOPDIR)/src/jdk.pack200/share/native/unpack200
|
||||
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \
|
||||
-I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
|
||||
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava
|
||||
|
||||
@ -79,6 +79,9 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
|
||||
CFLAGS_linux := -fPIC, \
|
||||
CFLAGS_solaris := -KPIC, \
|
||||
CFLAGS_macosx := -fPIC, \
|
||||
DISABLED_WARNINGS_gcc := sign-compare unused-result format-nonliteral \
|
||||
format-security parentheses, \
|
||||
DISABLED_WARNINGS_microsoft := 4267 4018, \
|
||||
MAPFILE := $(UNPACK_MAPFILE),\
|
||||
LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
|
||||
$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
|
||||
@ -96,7 +99,7 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
|
||||
-D "JDK_INTERNAL_NAME=unpack200" \
|
||||
-D "JDK_FTYPE=0x1L", \
|
||||
DEBUG_SYMBOLS := true, \
|
||||
MANIFEST := $(JDK_TOPDIR)/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest))
|
||||
MANIFEST := $(JDK_TOPDIR)/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest))
|
||||
|
||||
ifneq ($(USE_EXTERNAL_LIBZ), true)
|
||||
|
||||
32
jdk/make/launcher/Launcher-jdk.policytool.gmk
Normal file
32
jdk/make/launcher/Launcher-jdk.policytool.gmk
Normal file
@ -0,0 +1,32 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
include LauncherCommon.gmk
|
||||
|
||||
ifndef BUILD_HEADLESS_ONLY
|
||||
$(eval $(call SetupLauncher,policytool, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \
|
||||
$(XLIBS)))
|
||||
endif
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -55,6 +55,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
|
||||
OPTIMIZATION := HIGHEST, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
$(BUILD_LIBMLIB_CFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := parentheses, \
|
||||
DISABLED_WARNINGS_clang := parentheses, \
|
||||
DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
|
||||
MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -127,6 +130,7 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
|
||||
CFLAGS := -xarch=sparcvis \
|
||||
$(LIBMLIB_IMAGE_V_CFLAGS) \
|
||||
$(CFLAGS_JDKLIB), \
|
||||
DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
|
||||
MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
|
||||
@ -175,9 +179,6 @@ LIBAWT_CFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
|
||||
|
||||
LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
|
||||
LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
|
||||
LIBAWT_CFLAGS += -xarch=sparcvis
|
||||
@ -253,6 +254,11 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
|
||||
LANG := $(LIBAWT_LANG), \
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
|
||||
format-nonliteral parentheses, \
|
||||
DISABLED_WARNINGS_clang := logical-op-parentheses, \
|
||||
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
|
||||
DISABLED_WARNINGS_microsoft := 4297 4244 4267, \
|
||||
ASFLAGS := $(LIBAWT_ASFLAGS), \
|
||||
MAPFILE := $(LIBAWT_MAPFILE), \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -361,6 +367,11 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
|
||||
$(X_CFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
|
||||
deprecated-declarations unused-result maybe-uninitialized format \
|
||||
format-security int-to-pointer-cast parentheses, \
|
||||
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
|
||||
E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \
|
||||
@ -417,6 +428,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
|
||||
$(LCMS_CFLAGS), \
|
||||
CFLAGS_solaris := -xc99=no_lib, \
|
||||
CFLAGS_windows := -DCMS_IS_WINDOWS_, \
|
||||
DISABLED_WARNINGS_gcc := format-nonliteral, \
|
||||
DISABLED_WARNINGS_clang := tautological-compare, \
|
||||
DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -495,6 +509,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJAVAJPEG_SRC)) \
|
||||
$(LIBJAVA_HEADER_FLAGS) \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
|
||||
DISABLED_WARNINGS_gcc := clobbered parentheses, \
|
||||
DISABLED_WARNINGS_clang := logical-op-parentheses, \
|
||||
DISABLED_WARNINGS_microsoft := 4267, \
|
||||
MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -563,6 +580,9 @@ ifeq ($(BUILD_HEADLESS), true)
|
||||
$(CUPS_CFLAGS) \
|
||||
$(X_CFLAGS) \
|
||||
$(LIBAWT_HEADLESS_CFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := maybe-uninitialized int-to-pointer-cast, \
|
||||
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
|
||||
E_EMPTY_TRANSLATION_UNIT, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -644,6 +664,11 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
|
||||
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
|
||||
OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
|
||||
CFLAGS_windows = -DCC_NOEX, \
|
||||
DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast reorder \
|
||||
delete-non-virtual-dtor, \
|
||||
DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types, \
|
||||
DISABLED_WARNINGS_solstudio := truncwarn, \
|
||||
DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090, \
|
||||
MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
|
||||
LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -876,6 +901,10 @@ ifndef BUILD_HEADLESS_ONLY
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
|
||||
$(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := type-limits unused-result maybe-uninitialized, \
|
||||
DISABLED_WARNINGS_clang := incompatible-pointer-types, \
|
||||
DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST, \
|
||||
DISABLED_WARNINGS_microsoft := 4244 4267, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -946,6 +975,9 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
$(X_CFLAGS) \
|
||||
$(X_LIBS) \
|
||||
$(LIBAWT_LWAWT_CFLAGS), \
|
||||
DISABLED_WARNINGS_clang := incomplete-implementation \
|
||||
deprecated-declarations objc-method-access bitwise-op-parentheses \
|
||||
incompatible-pointer-types parentheses-equality extra-tokens, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN) \
|
||||
-L$(INSTALL_LIBRARIES_HERE), \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -26,7 +26,7 @@
|
||||
WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib
|
||||
|
||||
##########################################################################################
|
||||
# libfdlibm is statically linked with libjava below and not delivered into the
|
||||
# libfdlibm is statically linked with libjava below and not delivered into the
|
||||
# product on its own.
|
||||
|
||||
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
|
||||
@ -48,6 +48,8 @@ ifneq ($(OPENJDK_TARGET_OS), macosx)
|
||||
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
|
||||
CFLAGS_windows_debug := -DLOGGING, \
|
||||
CFLAGS_aix := -qfloat=nomaf, \
|
||||
DISABLED_WARNINGS_gcc := sign-compare, \
|
||||
DISABLED_WARNINGS_microsoft := 4146 4244 4018, \
|
||||
ARFLAGS := $(ARFLAGS), \
|
||||
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \
|
||||
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
|
||||
@ -94,6 +96,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \
|
||||
LANG := C, \
|
||||
OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
|
||||
CFLAGS := $(CFLAGS_JDKLIB), \
|
||||
DISABLED_WARNINGS_microsoft := 4244 4267, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libverify/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -147,6 +150,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
|
||||
OPTIMIZATION := HIGH, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
$(LIBJAVA_CFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := type-limits format-nonliteral, \
|
||||
DISABLED_WARNINGS_clang := int-conversion, \
|
||||
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
|
||||
DISABLED_WARNINGS_microsoft := 4022 4267, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -209,6 +216,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
|
||||
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
|
||||
CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
|
||||
DISABLED_WARNINGS_gcc := parentheses, \
|
||||
DISABLED_WARNINGS_clang := dangling-else, \
|
||||
DISABLED_WARNINGS_microsoft := 4267, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \
|
||||
REORDER := $(BUILD_LIBZIP_REORDER), \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
@ -307,6 +317,12 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
|
||||
LANG := C, \
|
||||
OPTIMIZATION := HIGH, \
|
||||
CFLAGS := $(LIBJLI_CFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := pointer-to-int-cast sign-compare format-nonliteral \
|
||||
parentheses, \
|
||||
DISABLED_WARNINGS_clang := implicit-function-declaration parentheses \
|
||||
int-conversion, \
|
||||
DISABLED_WARNINGS_solstudio := E_ASM_DISABLES_OPTIMIZATION E_NEWLINE_NOT_LAST, \
|
||||
DISABLED_WARNINGS_microsoft := 4244 4047 4267, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjli/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -355,6 +371,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
LANG := C, \
|
||||
OPTIMIZATION := HIGH, \
|
||||
CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
|
||||
DISABLED_WARNINGS_microsoft := 4244 4047 4267, \
|
||||
ARFLAGS := $(ARFLAGS), \
|
||||
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
|
||||
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
|
||||
@ -375,6 +392,8 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
LANG := C, \
|
||||
OPTIMIZATION := HIGH, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
|
||||
DISABLED_WARNINGS_clang := implicit-function-declaration parentheses \
|
||||
int-conversion, \
|
||||
LDFLAGS := -nostdlib -r, \
|
||||
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
|
||||
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
|
||||
@ -401,4 +420,3 @@ else ifeq ($(OPENJDK_TARGET_OS), aix)
|
||||
TARGETS += $(BUILD_LIBJLI_STATIC)
|
||||
|
||||
endif
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -41,6 +41,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \
|
||||
$(LIBJAVA_HEADER_FLAGS) \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
|
||||
DISABLED_WARNINGS_gcc := pointer-to-int-cast, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -82,6 +83,7 @@ ifneq ($(BUILD_CRYPTO), no)
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
$(addprefix -I, $(BUILD_LIBKRB5_SRC)) \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
|
||||
DISABLED_WARNINGS_clang := implicit-function-declaration, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -54,6 +54,8 @@ ifeq ($(ENABLE_INTREE_EC), yes)
|
||||
-DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
|
||||
CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
|
||||
$(BUILD_LIBSUNEC_FLAGS), \
|
||||
DISABLED_WARNINGS_gcc := sign-compare, \
|
||||
DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
|
||||
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -39,6 +39,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2PKCS11_SRC)) \
|
||||
$(LIBJAVA_HEADER_FLAGS) \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/jdk.crypto.pkcs11, \
|
||||
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
|
||||
DISABLED_WARNINGS_microsoft := 4013 4267, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -40,6 +40,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
-I$(LIBAPPLESCRIPTENGINE_SRC) \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/jdk.deploy.osx, \
|
||||
DISABLED_WARNINGS_clang := implicit-function-declaration format, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LDFLAGS_SUFFIX := -framework Cocoa \
|
||||
@ -71,6 +72,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
$(LIBOSX_CFLAGS), \
|
||||
DISABLED_WARNINGS_clang := deprecated-declarations, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
-L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -30,16 +30,20 @@ include LibCommon.gmk
|
||||
$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \
|
||||
LIBRARY := unpack, \
|
||||
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
|
||||
SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/libunpack \
|
||||
$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack, \
|
||||
SRC := $(JDK_TOPDIR)/src/jdk.pack200/share/native/libunpack \
|
||||
$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack, \
|
||||
LANG := C++, \
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CXXFLAGS_JDKLIB) \
|
||||
-DNO_ZLIB -DUNPACK_JNI -DFULL \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/java.base \
|
||||
-I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
|
||||
-I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \
|
||||
$(LIBJAVA_HEADER_FLAGS), \
|
||||
CFLAGS_release := -DPRODUCT, \
|
||||
DISABLED_WARNINGS_gcc := conversion-null sign-compare format-security \
|
||||
format-nonliteral parentheses, \
|
||||
DISABLED_WARNINGS_solstudio := truncwarn, \
|
||||
DISABLED_WARNINGS_microsoft := 4267 4018, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -33,6 +33,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNET, \
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
|
||||
$(LIBJAVA_HEADER_FLAGS) $(addprefix -I, $(LIBNET_SRC_DIRS)), \
|
||||
DISABLED_WARNINGS_gcc := format-nonliteral, \
|
||||
DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
|
||||
DISABLED_WARNINGS_microsoft := 4244 4047 4133, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnet/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -69,6 +69,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \
|
||||
OPTIMIZATION := HIGH, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
$(BUILD_LIBNIO_CFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := type-limits, \
|
||||
DISABLED_WARNINGS_clang := tautological-compare, \
|
||||
DISABLED_WARNINGS_microsoft := 4244, \
|
||||
MAPFILE := $(BUILD_LIBNIO_MAPFILE), \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -92,4 +95,3 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \
|
||||
TARGETS += $(BUILD_LIBNIO)
|
||||
|
||||
$(BUILD_LIBNIO): $(BUILD_LIBNET)
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -38,6 +38,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
$(addprefix -I, $(LIBOSXAPP_SRC)) \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
|
||||
DISABLED_WARNINGS_clang := objc-method-access objc-root-class, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LDFLAGS_SUFFIX_macosx := \
|
||||
@ -59,4 +60,3 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
TARGETS += $(BUILD_LIBOSXAPP)
|
||||
|
||||
endif
|
||||
|
||||
|
||||
@ -129,6 +129,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
$(LIBJSOUND_CFLAGS), \
|
||||
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
|
||||
DISABLED_WARNINGS_clang := implicit-function-declaration \
|
||||
deprecated-writable-strings, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -175,6 +177,7 @@ ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
|
||||
-DUSE_PORTS=TRUE \
|
||||
-DUSE_PLATFORM_MIDI_OUT=TRUE \
|
||||
-DUSE_PLATFORM_MIDI_IN=TRUE, \
|
||||
DISABLED_WARNINGS_gcc := parentheses, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
|
||||
@ -143,7 +143,7 @@ print_inline_info_record(jvmtiCompiledMethodLoadInlineRecord* record,
|
||||
|
||||
for (i = 0; i < numpcs; i++) {
|
||||
PCStackInfo pcrecord = (record->pcinfo[i]);
|
||||
fprintf(fp, "PcDescriptor(pc=0x%lx):\n", (jint)(pcrecord.pc));
|
||||
fprintf(fp, "PcDescriptor(pc=%p):\n", pcrecord.pc);
|
||||
print_stack_frames(&pcrecord, jvmti, fp);
|
||||
}
|
||||
}
|
||||
|
||||
@ -111,8 +111,6 @@ Agent::get_monitor(jvmtiEnv *jvmti, JNIEnv *env, jobject object)
|
||||
/* VM initialization and VM death calls to Agent */
|
||||
Agent::Agent(jvmtiEnv *jvmti, JNIEnv *env, jthread thread)
|
||||
{
|
||||
jvmtiError err;
|
||||
|
||||
stdout_message("Agent created..\n");
|
||||
stdout_message("VMInit...\n");
|
||||
/* Start monitor list */
|
||||
@ -129,8 +127,6 @@ Agent::~Agent()
|
||||
|
||||
void Agent::vm_death(jvmtiEnv *jvmti, JNIEnv *env)
|
||||
{
|
||||
jvmtiError err;
|
||||
|
||||
/* Delete all Monitors we allocated */
|
||||
for ( int i = 0; i < (int)monitor_count; i++ ) {
|
||||
delete monitor_list[i];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -45,8 +45,13 @@ import java.util.Vector;
|
||||
* The X509V1CertImpl class is used as a conversion wrapper around
|
||||
* sun.security.x509.X509Cert certificates when running under JDK1.1.x.
|
||||
*
|
||||
* @deprecated This is the implementation class for the deprecated
|
||||
* {@code javax.security.cert.X509Certificate} class. The classes in the
|
||||
* {@code java.security.cert} package should be used instead.
|
||||
*
|
||||
* @author Jeff Nisewanger
|
||||
*/
|
||||
@Deprecated
|
||||
public class X509V1CertImpl extends X509Certificate implements Serializable {
|
||||
static final long serialVersionUID = -2048442350420423405L;
|
||||
private java.security.cert.X509Certificate wrappedCert;
|
||||
|
||||
@ -171,6 +171,11 @@ import java.util.Map;
|
||||
* variables, first call {@link java.util.Map#clear() Map.clear()}
|
||||
* before adding environment variables.
|
||||
*
|
||||
* <p>
|
||||
* Unless otherwise noted, passing a {@code null} argument to a constructor
|
||||
* or method in this class will cause a {@link NullPointerException} to be
|
||||
* thrown.
|
||||
*
|
||||
* @author Martin Buchholz
|
||||
* @since 1.5
|
||||
*/
|
||||
@ -193,7 +198,6 @@ public final class ProcessBuilder
|
||||
* command.
|
||||
*
|
||||
* @param command the list containing the program and its arguments
|
||||
* @throws NullPointerException if the argument is null
|
||||
*/
|
||||
public ProcessBuilder(List<String> command) {
|
||||
if (command == null)
|
||||
@ -228,8 +232,6 @@ public final class ProcessBuilder
|
||||
*
|
||||
* @param command the list containing the program and its arguments
|
||||
* @return this process builder
|
||||
*
|
||||
* @throws NullPointerException if the argument is null
|
||||
*/
|
||||
public ProcessBuilder command(List<String> command) {
|
||||
if (command == null)
|
||||
@ -554,7 +556,6 @@ public final class ProcessBuilder
|
||||
* }</pre>
|
||||
*
|
||||
* @param file The {@code File} for the {@code Redirect}.
|
||||
* @throws NullPointerException if the specified file is null
|
||||
* @return a redirect to read from the specified file
|
||||
*/
|
||||
public static Redirect from(final File file) {
|
||||
@ -581,7 +582,6 @@ public final class ProcessBuilder
|
||||
* }</pre>
|
||||
*
|
||||
* @param file The {@code File} for the {@code Redirect}.
|
||||
* @throws NullPointerException if the specified file is null
|
||||
* @return a redirect to write to the specified file
|
||||
*/
|
||||
public static Redirect to(final File file) {
|
||||
@ -612,7 +612,6 @@ public final class ProcessBuilder
|
||||
* }</pre>
|
||||
*
|
||||
* @param file The {@code File} for the {@code Redirect}.
|
||||
* @throws NullPointerException if the specified file is null
|
||||
* @return a redirect to append to the specified file
|
||||
*/
|
||||
public static Redirect appendTo(final File file) {
|
||||
|
||||
@ -266,16 +266,15 @@ public abstract class Charset$Coder$ {
|
||||
* method, passing the new replacement, after checking that the new
|
||||
* replacement is acceptable. </p>
|
||||
*
|
||||
* @param newReplacement The replacement value
|
||||
*
|
||||
* @param newReplacement The new replacement; must not be
|
||||
* <tt>null</tt>, must have non-zero length,
|
||||
#if[decoder]
|
||||
* The new replacement; must not be <tt>null</tt>
|
||||
* and must have non-zero length
|
||||
* and must not be longer than the value returned by the
|
||||
* {@link #max$ItypesPerOtype$() max$ItypesPerOtype$} method
|
||||
#end[decoder]
|
||||
#if[encoder]
|
||||
* The new replacement; must not be <tt>null</tt>, must have
|
||||
* non-zero length, must not be longer than the value returned by
|
||||
* the {@link #max$ItypesPerOtype$() max$ItypesPerOtype$} method, and
|
||||
* must not be longer than the value returned by the
|
||||
* {@link #max$ItypesPerOtype$() max$ItypesPerOtype$} method, and
|
||||
* must be {@link #isLegalReplacement legal}
|
||||
#end[encoder]
|
||||
*
|
||||
|
||||
@ -82,8 +82,12 @@ import java.security.Principal;
|
||||
* @see java.security.acl.Acl#getPermissions
|
||||
*
|
||||
* @author Satish Dharmaraj
|
||||
*
|
||||
* @deprecated This package has been replaced by {@code java.security.Policy}
|
||||
* and related classes since 1.2.
|
||||
*/
|
||||
|
||||
@Deprecated
|
||||
public interface Acl extends Owner {
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -50,7 +50,11 @@ import java.security.Principal;
|
||||
* @see java.security.acl.Acl
|
||||
*
|
||||
* @author Satish Dharmaraj
|
||||
*
|
||||
* @deprecated This package has been replaced by {@code java.security.Policy}
|
||||
* and related classes since 1.2.
|
||||
*/
|
||||
@Deprecated
|
||||
public interface AclEntry extends Cloneable {
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -30,7 +30,11 @@ package java.security.acl;
|
||||
* non-existent ACL (Access Control List).
|
||||
*
|
||||
* @author Satish Dharmaraj
|
||||
*
|
||||
* @deprecated This package has been replaced by {@code java.security.Policy}
|
||||
* and related classes since 1.2.
|
||||
*/
|
||||
@Deprecated
|
||||
public class AclNotFoundException extends Exception {
|
||||
|
||||
private static final long serialVersionUID = 5684295034092681791L;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -39,7 +39,11 @@ import java.security.Principal;
|
||||
* Principal or Group.
|
||||
*
|
||||
* @author Satish Dharmaraj
|
||||
*
|
||||
* @deprecated This package has been replaced by {@code java.security.Policy}
|
||||
* and related classes since 1.2.
|
||||
*/
|
||||
@Deprecated
|
||||
public interface Group extends Principal {
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -32,7 +32,11 @@ package java.security.acl;
|
||||
* @see java.security.acl.Owner#deleteOwner
|
||||
*
|
||||
* @author Satish Dharmaraj
|
||||
*
|
||||
* @deprecated This package has been replaced by {@code java.security.Policy}
|
||||
* and related classes since 1.2.
|
||||
*/
|
||||
@Deprecated
|
||||
public class LastOwnerException extends Exception {
|
||||
|
||||
private static final long serialVersionUID = -5141997548211140359L;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -31,7 +31,11 @@ package java.security.acl;
|
||||
* the object, but the Principal attempting the modification is not an owner.
|
||||
*
|
||||
* @author Satish Dharmaraj
|
||||
*
|
||||
* @deprecated This package has been replaced by {@code java.security.Policy}
|
||||
* and related classes since 1.2.
|
||||
*/
|
||||
@Deprecated
|
||||
public class NotOwnerException extends Exception {
|
||||
|
||||
private static final long serialVersionUID = -5555597911163362399L;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -36,7 +36,10 @@ import java.security.Principal;
|
||||
*
|
||||
* @see java.security.acl.Acl
|
||||
*
|
||||
* @deprecated This package has been replaced by {@code java.security.Policy}
|
||||
* and related classes since 1.2.
|
||||
*/
|
||||
@Deprecated
|
||||
public interface Owner {
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -31,7 +31,11 @@ package java.security.acl;
|
||||
* a particular type of access to a resource.
|
||||
*
|
||||
* @author Satish Dharmaraj
|
||||
*
|
||||
* @deprecated This package has been replaced by {@code java.security.Policy}
|
||||
* and related classes since 1.2.
|
||||
*/
|
||||
@Deprecated
|
||||
public interface Permission {
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -24,10 +24,12 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* The classes and interfaces in this package have been
|
||||
* superseded by classes in the java.security package.
|
||||
* See that package and, for example, java.security.Permission for details.
|
||||
* The classes and interfaces in this package have been deprecated.
|
||||
* The {@code java.security} package contains suitable replacements.
|
||||
* See that package and, for example, {@code java.security.Permission}
|
||||
* for details.
|
||||
*
|
||||
* @since 1.1
|
||||
*/
|
||||
@Deprecated
|
||||
package java.security.acl;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -89,7 +89,7 @@ public class PKCS8EncodedKeySpec extends EncodedKeySpec {
|
||||
* Java Cryptography Architecture Standard Algorithm Name Documentation</a>
|
||||
* for information about standard algorithm names.
|
||||
* @throws NullPointerException if {@code encodedKey}
|
||||
* or {@algorithm} is null.
|
||||
* or {@code algorithm} is null.
|
||||
* @throws IllegalArgumentException if {@code algorithm} is
|
||||
* the empty string {@code ""}
|
||||
* @since 1.9
|
||||
|
||||
@ -216,7 +216,16 @@ final class Parsed implements TemporalAccessor {
|
||||
return (R) (date != null ? LocalDate.from(date) : null);
|
||||
} else if (query == TemporalQueries.localTime()) {
|
||||
return (R) time;
|
||||
} else if (query == TemporalQueries.zone() || query == TemporalQueries.offset()) {
|
||||
} else if (query == TemporalQueries.offset()) {
|
||||
Long offsetSecs = fieldValues.get(OFFSET_SECONDS);
|
||||
if (offsetSecs != null) {
|
||||
return (R) ZoneOffset.ofTotalSeconds(offsetSecs.intValue());
|
||||
}
|
||||
if (zone instanceof ZoneOffset) {
|
||||
return (R)zone;
|
||||
}
|
||||
return query.queryFrom(this);
|
||||
} else if (query == TemporalQueries.zone()) {
|
||||
return query.queryFrom(this);
|
||||
} else if (query == TemporalQueries.precision()) {
|
||||
return null; // not a complete date/time
|
||||
|
||||
@ -1183,7 +1183,7 @@ public final class Matcher implements MatchResult {
|
||||
*
|
||||
* <p> Given the regular expression <tt>dog</tt>, the input
|
||||
* <tt>"zzzdogzzzdogzzz"</tt>, and the function
|
||||
* <tt>mr -> mr.group().toUpperCase()</tt>, an invocation of this method on
|
||||
* {@code mr -> mr.group().toUpperCase()}, an invocation of this method on
|
||||
* a matcher for that expression would yield the string
|
||||
* <tt>"zzzDOGzzzDOGzzz"</tt>.
|
||||
*
|
||||
@ -1405,7 +1405,7 @@ public final class Matcher implements MatchResult {
|
||||
*
|
||||
* <p> Given the regular expression <tt>dog</tt>, the input
|
||||
* <tt>"zzzdogzzzdogzzz"</tt>, and the function
|
||||
* <tt>mr -> mr.group().toUpperCase()</tt>, an invocation of this method on
|
||||
* {@code mr -> mr.group().toUpperCase()}, an invocation of this method on
|
||||
* a matcher for that expression would yield the string
|
||||
* <tt>"zzzDOGzzzdogzzz"</tt>.
|
||||
*
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -152,7 +152,11 @@ public class HandshakeCompletedEvent extends EventObject
|
||||
* {@link javax.security.cert.X509Certificate} format).
|
||||
* @exception SSLPeerUnverifiedException if the peer is not verified.
|
||||
* @see #getPeerPrincipal()
|
||||
* @deprecated The {@link #getPeerCertificates()} method that returns an
|
||||
* array of {@code java.security.cert.Certificate} should
|
||||
* be used instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
|
||||
throws SSLPeerUnverifiedException
|
||||
{
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -272,7 +272,11 @@ public interface SSLSession {
|
||||
* @exception SSLPeerUnverifiedException if the peer's identity
|
||||
* has not been verified
|
||||
* @see #getPeerPrincipal()
|
||||
* @deprecated The {@link #getPeerCertificates()} method that returns an
|
||||
* array of {@code java.security.cert.Certificate} should
|
||||
* be used instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
|
||||
throws SSLPeerUnverifiedException;
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -57,9 +57,11 @@ import java.security.SignatureException;
|
||||
*
|
||||
* @since 1.4
|
||||
* @see X509Certificate
|
||||
* @deprecated Use the classes in {@code java.security.cert} instead.
|
||||
*
|
||||
* @author Hemma Prafullchandra
|
||||
*/
|
||||
@Deprecated
|
||||
public abstract class Certificate {
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -38,7 +38,9 @@ package javax.security.cert;
|
||||
*
|
||||
* @since 1.4
|
||||
* @author Hemma Prafullchandra
|
||||
* @deprecated Use the classes in {@code java.security.cert} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public class CertificateEncodingException extends CertificateException {
|
||||
|
||||
private static final long serialVersionUID = -8187642723048403470L;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -38,7 +38,9 @@ package javax.security.cert;
|
||||
* @author Hemma Prafullchandra
|
||||
* @since 1.4
|
||||
* @see Certificate
|
||||
* @deprecated Use the classes in {@code java.security.cert} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public class CertificateException extends Exception {
|
||||
|
||||
private static final long serialVersionUID = -5757213374030785290L;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -40,7 +40,9 @@ package javax.security.cert;
|
||||
*
|
||||
* @since 1.4
|
||||
* @author Hemma Prafullchandra
|
||||
* @deprecated Use the classes in {@code java.security.cert} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public class CertificateExpiredException extends CertificateException {
|
||||
|
||||
private static final long serialVersionUID = 5091601212177261883L;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -40,7 +40,9 @@ package javax.security.cert;
|
||||
*
|
||||
* @since 1.4
|
||||
* @author Hemma Prafullchandra
|
||||
* @deprecated Use the classes in {@code java.security.cert} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public class CertificateNotYetValidException extends CertificateException {
|
||||
|
||||
private static final long serialVersionUID = -8976172474266822818L;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -39,7 +39,9 @@ package javax.security.cert;
|
||||
*
|
||||
* @since 1.4
|
||||
* @author Hemma Prafullchandra
|
||||
* @deprecated Use the classes in {@code java.security.cert} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public class CertificateParsingException extends CertificateException {
|
||||
|
||||
private static final long serialVersionUID = -8449352422951136229L;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -124,7 +124,9 @@ import java.util.Date;
|
||||
* @see Certificate
|
||||
* @see java.security.cert.X509Extension
|
||||
* @see java.security.Security security properties
|
||||
* @deprecated Use the classes in {@code java.security.cert} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public abstract class X509Certificate extends Certificate {
|
||||
|
||||
/*
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -26,15 +26,16 @@
|
||||
/**
|
||||
* Provides classes for public key certificates.
|
||||
*
|
||||
* These classes include a simplified version of the
|
||||
* java.security.cert package. These classes were developed
|
||||
* as part of the Java Secure Socket
|
||||
* This package has been deprecated. These classes include a simplified
|
||||
* version of the {@code java.security.cert} package. These classes were
|
||||
* developed as part of the Java Secure Socket
|
||||
* Extension (JSSE). When JSSE was added to the J2SE version 1.4, this
|
||||
* package was added for backward-compatibility reasons only.
|
||||
*
|
||||
* New applications should not use this package, but rather
|
||||
* java.security.cert.
|
||||
* {@code java.security.cert}.
|
||||
*
|
||||
* @since 1.4
|
||||
*/
|
||||
@Deprecated
|
||||
package javax.security.cert;
|
||||
|
||||
@ -57,31 +57,29 @@ public final class Unsafe {
|
||||
* Provides the caller with the capability of performing unsafe
|
||||
* operations.
|
||||
*
|
||||
* <p> The returned <code>Unsafe</code> object should be carefully guarded
|
||||
* <p>The returned {@code Unsafe} object should be carefully guarded
|
||||
* by the caller, since it can be used to read and write data at arbitrary
|
||||
* memory addresses. It must never be passed to untrusted code.
|
||||
*
|
||||
* <p> Most methods in this class are very low-level, and correspond to a
|
||||
* <p>Most methods in this class are very low-level, and correspond to a
|
||||
* small number of hardware instructions (on typical machines). Compilers
|
||||
* are encouraged to optimize these methods accordingly.
|
||||
*
|
||||
* <p> Here is a suggested idiom for using unsafe operations:
|
||||
* <p>Here is a suggested idiom for using unsafe operations:
|
||||
*
|
||||
* <blockquote><pre>
|
||||
* <pre> {@code
|
||||
* class MyTrustedClass {
|
||||
* private static final Unsafe unsafe = Unsafe.getUnsafe();
|
||||
* ...
|
||||
* private long myCountAddress = ...;
|
||||
* public int getCount() { return unsafe.getByte(myCountAddress); }
|
||||
* }
|
||||
* </pre></blockquote>
|
||||
* }}</pre>
|
||||
*
|
||||
* (It may assist compilers to make the local variable be
|
||||
* <code>final</code>.)
|
||||
* (It may assist compilers to make the local variable {@code final}.)
|
||||
*
|
||||
* @exception SecurityException if a security manager exists and its
|
||||
* <code>checkPropertiesAccess</code> method doesn't allow
|
||||
* access to the system properties.
|
||||
* @throws SecurityException if a security manager exists and its
|
||||
* {@code checkPropertiesAccess} method doesn't allow
|
||||
* access to the system properties.
|
||||
*/
|
||||
@CallerSensitive
|
||||
public static Unsafe getUnsafe() {
|
||||
@ -100,28 +98,27 @@ public final class Unsafe {
|
||||
/**
|
||||
* Fetches a value from a given Java variable.
|
||||
* More specifically, fetches a field or array element within the given
|
||||
* object <code>o</code> at the given offset, or (if <code>o</code> is
|
||||
* null) from the memory address whose numerical value is the given
|
||||
* offset.
|
||||
* object {@code o} at the given offset, or (if {@code o} is null)
|
||||
* from the memory address whose numerical value is the given offset.
|
||||
* <p>
|
||||
* The results are undefined unless one of the following cases is true:
|
||||
* <ul>
|
||||
* <li>The offset was obtained from {@link #objectFieldOffset} on
|
||||
* the {@link java.lang.reflect.Field} of some Java field and the object
|
||||
* referred to by <code>o</code> is of a class compatible with that
|
||||
* referred to by {@code o} is of a class compatible with that
|
||||
* field's class.
|
||||
*
|
||||
* <li>The offset and object reference <code>o</code> (either null or
|
||||
* <li>The offset and object reference {@code o} (either null or
|
||||
* non-null) were both obtained via {@link #staticFieldOffset}
|
||||
* and {@link #staticFieldBase} (respectively) from the
|
||||
* reflective {@link Field} representation of some Java field.
|
||||
*
|
||||
* <li>The object referred to by <code>o</code> is an array, and the offset
|
||||
* is an integer of the form <code>B+N*S</code>, where <code>N</code> is
|
||||
* a valid index into the array, and <code>B</code> and <code>S</code> are
|
||||
* <li>The object referred to by {@code o} is an array, and the offset
|
||||
* is an integer of the form {@code B+N*S}, where {@code N} is
|
||||
* a valid index into the array, and {@code B} and {@code S} are
|
||||
* the values obtained by {@link #arrayBaseOffset} and {@link
|
||||
* #arrayIndexScale} (respectively) from the array's class. The value
|
||||
* referred to is the <code>N</code><em>th</em> element of the array.
|
||||
* referred to is the {@code N}<em>th</em> element of the array.
|
||||
*
|
||||
* </ul>
|
||||
* <p>
|
||||
@ -162,7 +159,7 @@ public final class Unsafe {
|
||||
* is stored into that variable.
|
||||
* <p>
|
||||
* The variable must be of the same type as the method
|
||||
* parameter <code>x</code>.
|
||||
* parameter {@code x}.
|
||||
*
|
||||
* @param o Java heap object in which the variable resides, if any, else
|
||||
* null
|
||||
@ -184,9 +181,9 @@ public final class Unsafe {
|
||||
/**
|
||||
* Stores a reference value into a given Java variable.
|
||||
* <p>
|
||||
* Unless the reference <code>x</code> being stored is either null
|
||||
* Unless the reference {@code x} being stored is either null
|
||||
* or matches the field type, the results are undefined.
|
||||
* If the reference <code>o</code> is non-null, car marks or
|
||||
* If the reference {@code o} is non-null, car marks or
|
||||
* other store barriers for that object (if the VM requires them)
|
||||
* are updated.
|
||||
* @see #putInt(Object, long, int)
|
||||
@ -272,11 +269,11 @@ public final class Unsafe {
|
||||
* zero, or does not point into a block obtained from {@link
|
||||
* #allocateMemory}, the results are undefined.
|
||||
*
|
||||
* <p> If the native pointer is less than 64 bits wide, it is extended as
|
||||
* <p>If the native pointer is less than 64 bits wide, it is extended as
|
||||
* an unsigned number to a Java long. The pointer may be indexed by any
|
||||
* given byte offset, simply by adding that offset (as a simple integer) to
|
||||
* the long representing the pointer. The number of bytes actually read
|
||||
* from the target address maybe determined by consulting {@link
|
||||
* from the target address may be determined by consulting {@link
|
||||
* #addressSize}.
|
||||
*
|
||||
* @see #allocateMemory
|
||||
@ -288,7 +285,7 @@ public final class Unsafe {
|
||||
* zero, or does not point into a block obtained from {@link
|
||||
* #allocateMemory}, the results are undefined.
|
||||
*
|
||||
* <p> The number of bytes actually written at the target address maybe
|
||||
* <p>The number of bytes actually written at the target address may be
|
||||
* determined by consulting {@link #addressSize}.
|
||||
*
|
||||
* @see #getAddress(long)
|
||||
@ -357,7 +354,7 @@ public final class Unsafe {
|
||||
* (usually zero). This provides a <em>single-register</em> addressing mode,
|
||||
* as discussed in {@link #getInt(Object,long)}.
|
||||
*
|
||||
* <p>Equivalent to <code>setMemory(null, address, bytes, value)</code>.
|
||||
* <p>Equivalent to {@code setMemory(null, address, bytes, value)}.
|
||||
*/
|
||||
public void setMemory(long address, long bytes, byte value) {
|
||||
setMemory(null, address, bytes, value);
|
||||
@ -388,7 +385,7 @@ public final class Unsafe {
|
||||
* block. This provides a <em>single-register</em> addressing mode,
|
||||
* as discussed in {@link #getInt(Object,long)}.
|
||||
*
|
||||
* Equivalent to <code>copyMemory(null, srcAddress, null, destAddress, bytes)</code>.
|
||||
* Equivalent to {@code copyMemory(null, srcAddress, null, destAddress, bytes)}.
|
||||
*/
|
||||
public void copyMemory(long srcAddress, long destAddress, long bytes) {
|
||||
copyMemory(null, srcAddress, null, destAddress, bytes);
|
||||
@ -413,7 +410,7 @@ public final class Unsafe {
|
||||
public static final int INVALID_FIELD_OFFSET = -1;
|
||||
|
||||
/**
|
||||
* Report the location of a given field in the storage allocation of its
|
||||
* Reports the location of a given field in the storage allocation of its
|
||||
* class. Do not expect to perform any sort of arithmetic on this offset;
|
||||
* it is just a cookie which is passed to the unsafe heap memory accessors.
|
||||
*
|
||||
@ -433,7 +430,7 @@ public final class Unsafe {
|
||||
public native long objectFieldOffset(Field f);
|
||||
|
||||
/**
|
||||
* Report the location of a given static field, in conjunction with {@link
|
||||
* Reports the location of a given static field, in conjunction with {@link
|
||||
* #staticFieldBase}.
|
||||
* <p>Do not expect to perform any sort of arithmetic on this offset;
|
||||
* it is just a cookie which is passed to the unsafe heap memory accessors.
|
||||
@ -452,7 +449,7 @@ public final class Unsafe {
|
||||
public native long staticFieldOffset(Field f);
|
||||
|
||||
/**
|
||||
* Report the location of a given static field, in conjunction with {@link
|
||||
* Reports the location of a given static field, in conjunction with {@link
|
||||
* #staticFieldOffset}.
|
||||
* <p>Fetch the base "Object", if any, with which static fields of the
|
||||
* given class can be accessed via methods like {@link #getInt(Object,
|
||||
@ -464,7 +461,7 @@ public final class Unsafe {
|
||||
public native Object staticFieldBase(Field f);
|
||||
|
||||
/**
|
||||
* Detect if the given class may need to be initialized. This is often
|
||||
* Detects if the given class may need to be initialized. This is often
|
||||
* needed in conjunction with obtaining the static field base of a
|
||||
* class.
|
||||
* @return false only if a call to {@code ensureClassInitialized} would have no effect
|
||||
@ -472,14 +469,14 @@ public final class Unsafe {
|
||||
public native boolean shouldBeInitialized(Class<?> c);
|
||||
|
||||
/**
|
||||
* Ensure the given class has been initialized. This is often
|
||||
* Ensures the given class has been initialized. This is often
|
||||
* needed in conjunction with obtaining the static field base of a
|
||||
* class.
|
||||
*/
|
||||
public native void ensureClassInitialized(Class<?> c);
|
||||
|
||||
/**
|
||||
* Report the offset of the first element in the storage allocation of a
|
||||
* Reports the offset of the first element in the storage allocation of a
|
||||
* given array class. If {@link #arrayIndexScale} returns a non-zero value
|
||||
* for the same class, you may use that scale factor, together with this
|
||||
* base offset, to form new offsets to access elements of arrays of the
|
||||
@ -527,7 +524,7 @@ public final class Unsafe {
|
||||
= theUnsafe.arrayBaseOffset(Object[].class);
|
||||
|
||||
/**
|
||||
* Report the scale factor for addressing elements in the storage
|
||||
* Reports the scale factor for addressing elements in the storage
|
||||
* allocation of a given array class. However, arrays of "narrow" types
|
||||
* will generally not work properly with accessors like {@link
|
||||
* #getByte(Object, long)}, so the scale factor for such classes is reported
|
||||
@ -576,7 +573,7 @@ public final class Unsafe {
|
||||
= theUnsafe.arrayIndexScale(Object[].class);
|
||||
|
||||
/**
|
||||
* Report the size in bytes of a native pointer, as stored via {@link
|
||||
* Reports the size in bytes of a native pointer, as stored via {@link
|
||||
* #putAddress}. This value will be either 4 or 8. Note that the sizes of
|
||||
* other primitive types (as stored in native memory blocks) is determined
|
||||
* fully by their information content.
|
||||
@ -587,7 +584,7 @@ public final class Unsafe {
|
||||
public static final int ADDRESS_SIZE = theUnsafe.addressSize();
|
||||
|
||||
/**
|
||||
* Report the size in bytes of a native memory page (whatever that is).
|
||||
* Reports the size in bytes of a native memory page (whatever that is).
|
||||
* This value will always be a power of two.
|
||||
*/
|
||||
public native int pageSize();
|
||||
@ -596,7 +593,7 @@ public final class Unsafe {
|
||||
/// random trusted operations from JNI:
|
||||
|
||||
/**
|
||||
* Tell the VM to define a class, without security checks. By default, the
|
||||
* Tells the VM to define a class, without security checks. By default, the
|
||||
* class loader and protection domain come from the caller's class.
|
||||
*/
|
||||
public native Class<?> defineClass(String name, byte[] b, int off, int len,
|
||||
@ -604,7 +601,7 @@ public final class Unsafe {
|
||||
ProtectionDomain protectionDomain);
|
||||
|
||||
/**
|
||||
* Define a class but do not make it known to the class loader or system dictionary.
|
||||
* Defines a class but does not make it known to the class loader or system dictionary.
|
||||
* <p>
|
||||
* For each CP entry, the corresponding CP patch must either be null or have
|
||||
* the a format that matches its tag:
|
||||
@ -621,38 +618,38 @@ public final class Unsafe {
|
||||
*/
|
||||
public native Class<?> defineAnonymousClass(Class<?> hostClass, byte[] data, Object[] cpPatches);
|
||||
|
||||
|
||||
/** Allocate an instance but do not run any constructor.
|
||||
Initializes the class if it has not yet been. */
|
||||
/**
|
||||
* Allocates an instance but does not run any constructor.
|
||||
* Initializes the class if it has not yet been.
|
||||
*/
|
||||
public native Object allocateInstance(Class<?> cls)
|
||||
throws InstantiationException;
|
||||
|
||||
/** Throw the exception without telling the verifier. */
|
||||
/** Throws the exception without telling the verifier. */
|
||||
public native void throwException(Throwable ee);
|
||||
|
||||
|
||||
/**
|
||||
* Atomically update Java variable to <tt>x</tt> if it is currently
|
||||
* holding <tt>expected</tt>.
|
||||
* @return <tt>true</tt> if successful
|
||||
* Atomically updates Java variable to {@code x} if it is currently
|
||||
* holding {@code expected}.
|
||||
* @return {@code true} if successful
|
||||
*/
|
||||
public final native boolean compareAndSwapObject(Object o, long offset,
|
||||
Object expected,
|
||||
Object x);
|
||||
|
||||
/**
|
||||
* Atomically update Java variable to <tt>x</tt> if it is currently
|
||||
* holding <tt>expected</tt>.
|
||||
* @return <tt>true</tt> if successful
|
||||
* Atomically updates Java variable to {@code x} if it is currently
|
||||
* holding {@code expected}.
|
||||
* @return {@code true} if successful
|
||||
*/
|
||||
public final native boolean compareAndSwapInt(Object o, long offset,
|
||||
int expected,
|
||||
int x);
|
||||
|
||||
/**
|
||||
* Atomically update Java variable to <tt>x</tt> if it is currently
|
||||
* holding <tt>expected</tt>.
|
||||
* @return <tt>true</tt> if successful
|
||||
* Atomically updates Java variable to {@code x} if it is currently
|
||||
* holding {@code expected}.
|
||||
* @return {@code true} if successful
|
||||
*/
|
||||
public final native boolean compareAndSwapLong(Object o, long offset,
|
||||
long expected,
|
||||
@ -736,28 +733,28 @@ public final class Unsafe {
|
||||
public native void putOrderedLong(Object o, long offset, long x);
|
||||
|
||||
/**
|
||||
* Unblock the given thread blocked on <tt>park</tt>, or, if it is
|
||||
* not blocked, cause the subsequent call to <tt>park</tt> not to
|
||||
* Unblocks the given thread blocked on {@code park}, or, if it is
|
||||
* not blocked, causes the subsequent call to {@code park} not to
|
||||
* block. Note: this operation is "unsafe" solely because the
|
||||
* caller must somehow ensure that the thread has not been
|
||||
* destroyed. Nothing special is usually required to ensure this
|
||||
* when called from Java (in which there will ordinarily be a live
|
||||
* reference to the thread) but this is not nearly-automatically
|
||||
* so when calling from native code.
|
||||
* @param thread the thread to unpark.
|
||||
*
|
||||
* @param thread the thread to unpark.
|
||||
*/
|
||||
public native void unpark(Object thread);
|
||||
|
||||
/**
|
||||
* Block current thread, returning when a balancing
|
||||
* <tt>unpark</tt> occurs, or a balancing <tt>unpark</tt> has
|
||||
* Blocks current thread, returning when a balancing
|
||||
* {@code unpark} occurs, or a balancing {@code unpark} has
|
||||
* already occurred, or the thread is interrupted, or, if not
|
||||
* absolute and time is not zero, the given time nanoseconds have
|
||||
* elapsed, or if absolute, the given deadline in milliseconds
|
||||
* since Epoch has passed, or spuriously (i.e., returning for no
|
||||
* "reason"). Note: This operation is in the Unsafe class only
|
||||
* because <tt>unpark</tt> is, so it would be strange to place it
|
||||
* because {@code unpark} is, so it would be strange to place it
|
||||
* elsewhere.
|
||||
*/
|
||||
public native void park(boolean isAbsolute, long time);
|
||||
@ -765,8 +762,8 @@ public final class Unsafe {
|
||||
/**
|
||||
* Gets the load average in the system run queue assigned
|
||||
* to the available processors averaged over various periods of time.
|
||||
* This method retrieves the given <tt>nelem</tt> samples and
|
||||
* assigns to the elements of the given <tt>loadavg</tt> array.
|
||||
* This method retrieves the given {@code nelem} samples and
|
||||
* assigns to the elements of the given {@code loadavg} array.
|
||||
* The system imposes a maximum of 3 samples, representing
|
||||
* averages over the last 1, 5, and 15 minutes, respectively.
|
||||
*
|
||||
@ -784,8 +781,8 @@ public final class Unsafe {
|
||||
|
||||
/**
|
||||
* Atomically adds the given value to the current value of a field
|
||||
* or array element within the given object <code>o</code>
|
||||
* at the given <code>offset</code>.
|
||||
* or array element within the given object {@code o}
|
||||
* at the given {@code offset}.
|
||||
*
|
||||
* @param o object/array to update the field/element in
|
||||
* @param offset field/element offset
|
||||
@ -803,8 +800,8 @@ public final class Unsafe {
|
||||
|
||||
/**
|
||||
* Atomically adds the given value to the current value of a field
|
||||
* or array element within the given object <code>o</code>
|
||||
* at the given <code>offset</code>.
|
||||
* or array element within the given object {@code o}
|
||||
* at the given {@code offset}.
|
||||
*
|
||||
* @param o object/array to update the field/element in
|
||||
* @param offset field/element offset
|
||||
@ -822,8 +819,8 @@ public final class Unsafe {
|
||||
|
||||
/**
|
||||
* Atomically exchanges the given value with the current value of
|
||||
* a field or array element within the given object <code>o</code>
|
||||
* at the given <code>offset</code>.
|
||||
* a field or array element within the given object {@code o}
|
||||
* at the given {@code offset}.
|
||||
*
|
||||
* @param o object/array to update the field/element in
|
||||
* @param offset field/element offset
|
||||
@ -841,8 +838,8 @@ public final class Unsafe {
|
||||
|
||||
/**
|
||||
* Atomically exchanges the given value with the current value of
|
||||
* a field or array element within the given object <code>o</code>
|
||||
* at the given <code>offset</code>.
|
||||
* a field or array element within the given object {@code o}
|
||||
* at the given {@code offset}.
|
||||
*
|
||||
* @param o object/array to update the field/element in
|
||||
* @param offset field/element offset
|
||||
@ -861,7 +858,7 @@ public final class Unsafe {
|
||||
/**
|
||||
* Atomically exchanges the given reference value with the current
|
||||
* reference value of a field or array element within the given
|
||||
* object <code>o</code> at the given <code>offset</code>.
|
||||
* object {@code o} at the given {@code offset}.
|
||||
*
|
||||
* @param o object/array to update the field/element in
|
||||
* @param offset field/element offset
|
||||
|
||||
13
jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
13
jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -244,7 +244,9 @@ public abstract class AbstractDelegateHttpsURLConnection extends
|
||||
public java.security.cert.Certificate[] getServerCertificates()
|
||||
throws SSLPeerUnverifiedException {
|
||||
if (cachedResponse != null) {
|
||||
List<java.security.cert.Certificate> l = ((SecureCacheResponse)cachedResponse).getServerCertificateChain();
|
||||
List<java.security.cert.Certificate> l =
|
||||
((SecureCacheResponse)cachedResponse)
|
||||
.getServerCertificateChain();
|
||||
if (l == null) {
|
||||
return null;
|
||||
} else {
|
||||
@ -262,7 +264,12 @@ public abstract class AbstractDelegateHttpsURLConnection extends
|
||||
/**
|
||||
* Returns the server's X.509 certificate chain, or null if
|
||||
* the server did not authenticate.
|
||||
*
|
||||
* @deprecated This method returns the deprecated
|
||||
* {@code javax.security.cert.X509Certificate} type.
|
||||
* Use {@code getServerCertificates()} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public javax.security.cert.X509Certificate[] getServerCertificateChain()
|
||||
throws SSLPeerUnverifiedException {
|
||||
if (cachedResponse != null) {
|
||||
@ -271,7 +278,7 @@ public abstract class AbstractDelegateHttpsURLConnection extends
|
||||
if (http == null) {
|
||||
throw new IllegalStateException("connection not yet open");
|
||||
} else {
|
||||
return ((HttpsClient)http).getServerCertificateChain ();
|
||||
return ((HttpsClient)http).getServerCertificateChain();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -699,7 +699,12 @@ final class HttpsClient extends HttpClient
|
||||
/**
|
||||
* Returns the X.509 certificate chain with which the server
|
||||
* authenticated itself, or null if the server did not authenticate.
|
||||
*
|
||||
* @deprecated This method returns the deprecated
|
||||
* {@code javax.security.cert.X509Certificate} type.
|
||||
* Use {@code getServerCertificates()} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
javax.security.cert.X509Certificate [] getServerCertificateChain()
|
||||
throws SSLPeerUnverifiedException
|
||||
{
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -204,7 +204,12 @@ public class HttpsURLConnectionImpl
|
||||
* NOTE: This method is not necessary for the version of this class
|
||||
* implementing javax.net.ssl.HttpsURLConnection, but provided for
|
||||
* compatibility with the com.sun.net.ssl.HttpsURLConnection version.
|
||||
*
|
||||
* @deprecated This method returns the deprecated
|
||||
* {@code javax.security.cert.X509Certificate} type.
|
||||
* Use {@code getServerCertificates()} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public javax.security.cert.X509Certificate[] getServerCertificateChain() {
|
||||
try {
|
||||
return delegate.getServerCertificateChain();
|
||||
|
||||
@ -1569,6 +1569,9 @@ final class ClientHandshaker extends Handshaker {
|
||||
/*
|
||||
* Returns the subject alternative name of the specified type in the
|
||||
* subjectAltNames extension of a certificate.
|
||||
*
|
||||
* Note that only those subjectAltName types that use String data
|
||||
* should be passed into this function.
|
||||
*/
|
||||
private static Collection<String> getSubjectAltNames(
|
||||
Collection<List<?>> subjectAltNames, int type) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -464,8 +464,13 @@ final class SSLSessionImpl extends ExtendedSSLSession {
|
||||
*
|
||||
* @return array of peer X.509 certs, with the peer's own cert
|
||||
* first in the chain, and with the "root" CA last.
|
||||
*
|
||||
* @deprecated This method returns the deprecated
|
||||
* {@code javax.security.cert.X509Certificate} type.
|
||||
* Use {@code getPeerCertificates()} instead.
|
||||
*/
|
||||
@Override
|
||||
@Deprecated
|
||||
public javax.security.cert.X509Certificate[] getPeerCertificateChain()
|
||||
throws SSLPeerUnverifiedException {
|
||||
//
|
||||
|
||||
@ -661,15 +661,24 @@ SetJvmEnvironment(int argc, char **argv) {
|
||||
* arguments are for the application (i.e. the main class name, or
|
||||
* the -jar argument).
|
||||
*/
|
||||
if ((i > 0 && *arg != '-')
|
||||
|| JLI_StrCmp(arg, "-version") == 0
|
||||
|| JLI_StrCmp(arg, "-fullversion") == 0
|
||||
|| JLI_StrCmp(arg, "-help") == 0
|
||||
|| JLI_StrCmp(arg, "-?") == 0
|
||||
|| JLI_StrCmp(arg, "-jar") == 0
|
||||
|| JLI_StrCmp(arg, "-X") == 0
|
||||
) {
|
||||
return;
|
||||
if (i > 0) {
|
||||
char *prev = argv[i - 1];
|
||||
// skip non-dash arg preceded by class path specifiers
|
||||
if (*arg != '-' &&
|
||||
((JLI_StrCmp(prev, "-cp") == 0
|
||||
|| JLI_StrCmp(prev, "-classpath") == 0))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (*arg != '-'
|
||||
|| JLI_StrCmp(arg, "-version") == 0
|
||||
|| JLI_StrCmp(arg, "-fullversion") == 0
|
||||
|| JLI_StrCmp(arg, "-help") == 0
|
||||
|| JLI_StrCmp(arg, "-?") == 0
|
||||
|| JLI_StrCmp(arg, "-jar") == 0
|
||||
|| JLI_StrCmp(arg, "-X") == 0) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
/*
|
||||
* The following case checks for "-XX:NativeMemoryTracking=value".
|
||||
|
||||
@ -32,13 +32,16 @@
|
||||
* Zip file header signatures
|
||||
*/
|
||||
#define SIGSIZ 4 /* size of all header signatures */
|
||||
#define LOCSIG 0x04034b50L /* "PK\003\004" */
|
||||
#define EXTSIG 0x08074b50L /* "PK\007\008" */
|
||||
#define CENSIG 0x02014b50L /* "PK\001\002" */
|
||||
#define ENDSIG 0x06054b50L /* "PK\005\006" */
|
||||
|
||||
#define ZIP64_ENDSIG 0x06064b50L /* "PK\006\006" */
|
||||
#define ZIP64_LOCSIG 0x07064b50L /* "PK\006\007" */
|
||||
#define PKZIP_SIGNATURE_AT(p, b2, b3) \
|
||||
(((p)[0] == 'P') & ((p)[1] == 'K') & ((p)[2] == b2) & ((p)[3] == b3))
|
||||
#define CENSIG_AT(p) PKZIP_SIGNATURE_AT(p, 1, 2)
|
||||
#define LOCSIG_AT(p) PKZIP_SIGNATURE_AT(p, 3, 4)
|
||||
#define ENDSIG_AT(p) PKZIP_SIGNATURE_AT(p, 5, 6)
|
||||
#define EXTSIG_AT(p) PKZIP_SIGNATURE_AT(p, 7, 8)
|
||||
#define ZIP64_ENDSIG_AT(p) PKZIP_SIGNATURE_AT(p, 6, 6)
|
||||
#define ZIP64_LOCSIG_AT(p) PKZIP_SIGNATURE_AT(p, 6, 7)
|
||||
|
||||
/*
|
||||
* Header sizes including signatures
|
||||
*/
|
||||
|
||||
@ -138,7 +138,7 @@ find_end64(int fd, Byte *ep, jlong pos)
|
||||
return -1;
|
||||
if ((bytes = read(fd, ep, ZIP64_LOCHDR)) < 0)
|
||||
return -1;
|
||||
if (GETSIG(ep) == ZIP64_LOCSIG)
|
||||
if (ZIP64_LOCSIG_AT(ep))
|
||||
return end64pos;
|
||||
return -1;
|
||||
}
|
||||
@ -176,7 +176,7 @@ find_end(int fd, Byte *eb)
|
||||
return (-1);
|
||||
if ((bytes = read(fd, eb, ENDHDR)) < 0)
|
||||
return (-1);
|
||||
if (GETSIG(eb) == ENDSIG) {
|
||||
if (ENDSIG_AT(eb)) {
|
||||
return haveZIP64(eb) ? find_end64(fd, eb, pos) : pos;
|
||||
}
|
||||
|
||||
@ -200,14 +200,11 @@ find_end(int fd, Byte *eb)
|
||||
|
||||
/*
|
||||
* Search backwards from the end of file stopping when the END header
|
||||
* signature is found. (The first condition of the "if" is just a
|
||||
* fast fail, because the GETSIG macro isn't always cheap. The
|
||||
* final condition protects against false positives.)
|
||||
* signature is found.
|
||||
*/
|
||||
endpos = &buffer[bytes];
|
||||
for (cp = &buffer[bytes - ENDHDR]; cp >= &buffer[0]; cp--)
|
||||
if ((*cp == (ENDSIG & 0xFF)) && (GETSIG(cp) == ENDSIG) &&
|
||||
(cp + ENDHDR + ENDCOM(cp) == endpos)) {
|
||||
if (ENDSIG_AT(cp) && (cp + ENDHDR + ENDCOM(cp) == endpos)) {
|
||||
(void) memcpy(eb, cp, ENDHDR);
|
||||
free(buffer);
|
||||
pos = flen - (endpos - cp);
|
||||
@ -267,7 +264,7 @@ compute_cen(int fd, Byte *bp)
|
||||
if ((bytes = read(fd, buffer, MINREAD)) < 0) {
|
||||
return (-1);
|
||||
}
|
||||
if (GETSIG(buffer) != ZIP64_ENDSIG) {
|
||||
if (!ZIP64_ENDSIG_AT(buffer)) {
|
||||
return -1;
|
||||
}
|
||||
if ((offset = ZIP64_ENDOFF(buffer)) < (jlong)0) {
|
||||
@ -356,7 +353,7 @@ find_file(int fd, zentry *entry, const char *file_name)
|
||||
* Loop through the Central Directory Headers. Note that a valid zip/jar
|
||||
* must have an ENDHDR (with ENDSIG) after the Central Directory.
|
||||
*/
|
||||
while (GETSIG(p) == CENSIG) {
|
||||
while (CENSIG_AT(p)) {
|
||||
|
||||
/*
|
||||
* If a complete header isn't in the buffer, shift the contents
|
||||
@ -403,7 +400,7 @@ find_file(int fd, zentry *entry, const char *file_name)
|
||||
free(buffer);
|
||||
return (-1);
|
||||
}
|
||||
if (GETSIG(locbuf) != LOCSIG) {
|
||||
if (!LOCSIG_AT(locbuf)) {
|
||||
free(buffer);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
@ -281,9 +281,9 @@ static jboolean verifyEND(jzfile *zip, jlong endpos, char *endbuf) {
|
||||
return (cenpos >= 0 &&
|
||||
locpos >= 0 &&
|
||||
readFullyAt(zip->zfd, buf, sizeof(buf), cenpos) != -1 &&
|
||||
GETSIG(buf) == CENSIG &&
|
||||
CENSIG_AT(buf) &&
|
||||
readFullyAt(zip->zfd, buf, sizeof(buf), locpos) != -1 &&
|
||||
GETSIG(buf) == LOCSIG);
|
||||
LOCSIG_AT(buf));
|
||||
}
|
||||
|
||||
/*
|
||||
@ -674,7 +674,7 @@ readCEN(jzfile *zip, jint knownTotal)
|
||||
method = CENHOW(cp);
|
||||
nlen = CENNAM(cp);
|
||||
|
||||
if (GETSIG(cp) != CENSIG)
|
||||
if (!CENSIG_AT(cp))
|
||||
ZIP_FORMAT_ERROR("invalid CEN header (bad signature)");
|
||||
if (CENFLG(cp) & 1)
|
||||
ZIP_FORMAT_ERROR("invalid CEN header (encrypted entry)");
|
||||
@ -827,10 +827,7 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
|
||||
|
||||
// Assumption, zfd refers to start of file. Trivially, reuse errbuf.
|
||||
if (readFully(zfd, errbuf, 4) != -1) { // errors will be handled later
|
||||
if (GETSIG(errbuf) == LOCSIG)
|
||||
zip->locsig = JNI_TRUE;
|
||||
else
|
||||
zip->locsig = JNI_FALSE;
|
||||
zip->locsig = LOCSIG_AT(errbuf) ? JNI_TRUE : JNI_FALSE;
|
||||
}
|
||||
|
||||
len = zip->len = IO_Lseek(zfd, 0, SEEK_END);
|
||||
@ -1284,7 +1281,7 @@ ZIP_GetEntryDataOffset(jzfile *zip, jzentry *entry)
|
||||
zip->msg = "error reading zip file";
|
||||
return -1;
|
||||
}
|
||||
if (GETSIG(loc) != LOCSIG) {
|
||||
if (!LOCSIG_AT(loc)) {
|
||||
zip->msg = "invalid LOC header (bad signature)";
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -33,13 +33,14 @@
|
||||
/*
|
||||
* Header signatures
|
||||
*/
|
||||
#define LOCSIG 0x04034b50L /* "PK\003\004" */
|
||||
#define EXTSIG 0x08074b50L /* "PK\007\008" */
|
||||
#define CENSIG 0x02014b50L /* "PK\001\002" */
|
||||
#define ENDSIG 0x06054b50L /* "PK\005\006" */
|
||||
|
||||
#define ZIP64_ENDSIG 0x06064b50L /* "PK\006\006" */
|
||||
#define ZIP64_LOCSIG 0x07064b50L /* "PK\006\007" */
|
||||
#define PKZIP_SIGNATURE_AT(p, b2, b3) \
|
||||
(((p)[0] == 'P') & ((p)[1] == 'K') & ((p)[2] == b2) & ((p)[3] == b3))
|
||||
#define CENSIG_AT(p) PKZIP_SIGNATURE_AT(p, 1, 2)
|
||||
#define LOCSIG_AT(p) PKZIP_SIGNATURE_AT(p, 3, 4)
|
||||
#define ENDSIG_AT(p) PKZIP_SIGNATURE_AT(p, 5, 6)
|
||||
#define EXTSIG_AT(p) PKZIP_SIGNATURE_AT(p, 7, 8)
|
||||
#define ZIP64_ENDSIG_AT(p) PKZIP_SIGNATURE_AT(p, 6, 6)
|
||||
#define ZIP64_LOCSIG_AT(p) PKZIP_SIGNATURE_AT(p, 6, 7)
|
||||
|
||||
/*
|
||||
* Header sizes including signatures
|
||||
|
||||
@ -323,7 +323,7 @@ const char * isJar(const char * path) {
|
||||
result = BAD_MAGIC_MSG;
|
||||
|
||||
// be sure the file is at least a ZIP file
|
||||
if (GETSIG(buf) == LOCSIG) {
|
||||
if (LOCSIG_AT(buf)) {
|
||||
|
||||
off_t flen = LOCNAM(buf);
|
||||
off_t xlen = LOCEXT(buf);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -28,6 +28,7 @@
|
||||
#include <winsock2.h> /* needed for htonl */
|
||||
#include <iprtrmib.h>
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "java_net_NetworkInterface.h"
|
||||
#include "jni_util.h"
|
||||
@ -70,7 +71,7 @@ void printnifs (netif *netifPP, char *str) {
|
||||
|
||||
#endif
|
||||
|
||||
static int bufsize = 1024;
|
||||
static int bufsize = 4096;
|
||||
|
||||
/*
|
||||
* return an array of IP_ADAPTER_ADDRESSES containing one element
|
||||
@ -102,7 +103,11 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) {
|
||||
ret = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len);
|
||||
|
||||
if (ret == ERROR_BUFFER_OVERFLOW) {
|
||||
IP_ADAPTER_ADDRESSES * newAdapterInfo =
|
||||
IP_ADAPTER_ADDRESSES * newAdapterInfo = NULL;
|
||||
if (len < (ULONG_MAX - bufsize)) {
|
||||
len = len + bufsize;
|
||||
}
|
||||
newAdapterInfo =
|
||||
(IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len);
|
||||
if (newAdapterInfo == NULL) {
|
||||
free(adapterInfo);
|
||||
@ -113,7 +118,6 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) {
|
||||
|
||||
adapterInfo = newAdapterInfo;
|
||||
|
||||
bufsize = len;
|
||||
ret = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len);
|
||||
}
|
||||
|
||||
@ -176,7 +180,11 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) {
|
||||
flags |= GAA_FLAG_INCLUDE_PREFIX;
|
||||
val = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len);
|
||||
if (val == ERROR_BUFFER_OVERFLOW) {
|
||||
IP_ADAPTER_ADDRESSES * newAdapterInfo =
|
||||
IP_ADAPTER_ADDRESSES * newAdapterInfo = NULL;
|
||||
if (len < (ULONG_MAX - bufsize)) {
|
||||
len = len + bufsize;
|
||||
}
|
||||
newAdapterInfo =
|
||||
(IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len);
|
||||
if (newAdapterInfo == NULL) {
|
||||
free(adapterInfo);
|
||||
@ -187,7 +195,6 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) {
|
||||
|
||||
adapterInfo = newAdapterInfo;
|
||||
|
||||
bufsize = len;
|
||||
val = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len);
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -489,6 +489,8 @@ public abstract class Preferences {
|
||||
* <tt>MAX_VALUE_LENGTH</tt>.
|
||||
* @throws IllegalStateException if this node (or an ancestor) has been
|
||||
* removed with the {@link #removeNode()} method.
|
||||
* @throws IllegalArgumentException if either the key or the value contain
|
||||
* the null control character, code point U+0000.
|
||||
*/
|
||||
public abstract void put(String key, String value);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -49,6 +49,13 @@ import sun.util.logging.PlatformLogger;
|
||||
*/
|
||||
class FileSystemPreferences extends AbstractPreferences {
|
||||
|
||||
/**
|
||||
* The code point U+0000, assigned to the null control character, is the
|
||||
* only character encoded in Unicode and ISO/IEC 10646 that is always
|
||||
* invalid in any XML 1.0 and 1.1 document.
|
||||
*/
|
||||
private static final String CODE_POINT_U0000 = String.valueOf('\u0000');
|
||||
|
||||
static {
|
||||
PrivilegedAction<Void> load = () -> {
|
||||
System.loadLibrary("prefs");
|
||||
@ -525,6 +532,11 @@ class FileSystemPreferences extends AbstractPreferences {
|
||||
}
|
||||
|
||||
protected void putSpi(String key, String value) {
|
||||
if (key.indexOf(CODE_POINT_U0000) != -1) {
|
||||
throw new IllegalArgumentException("Key contains code point U+0000");
|
||||
} else if (value.indexOf(CODE_POINT_U0000) != -1) {
|
||||
throw new IllegalArgumentException("Value contains code point U+0000");
|
||||
}
|
||||
initCacheIfNecessary();
|
||||
changeLog.add(new Put(key, value));
|
||||
prefsCache.put(key, value);
|
||||
|
||||
@ -52,7 +52,7 @@ import java.util.List;
|
||||
* <pre>
|
||||
* XMLSignatureFactory factory = XMLSignatureFactory.getInstance("DOM");
|
||||
* Reference ref = factory.newReference("#reference-1", DigestMethod.SHA1);
|
||||
* List<Reference> references = Collections.singletonList(ref);
|
||||
* List<Reference> references = Collections.singletonList(ref);
|
||||
* Manifest manifest = factory.newManifest(references, "manifest-1");
|
||||
* </pre>
|
||||
*
|
||||
|
||||
@ -65,7 +65,7 @@ import javax.xml.crypto.XMLStructure;
|
||||
* <pre>
|
||||
* XMLSignatureFactory fac = XMLSignatureFactory.getInstance("DOM");
|
||||
* Manifest manifest = fac.newManifest(references);
|
||||
* List<XMLStructure> content = Collections.singletonList(manifest);
|
||||
* List<XMLStructure> content = Collections.singletonList(manifest);
|
||||
* XMLObject object = factory.newXMLObject(content, "object-1", null, null);
|
||||
* </pre>
|
||||
*
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -295,8 +295,8 @@ public class FormatData_fi extends ParallelListResourceBundle {
|
||||
},
|
||||
{ "DatePatterns",
|
||||
new String[] {
|
||||
"d. MMMM'ta 'yyyy", // full date pattern
|
||||
"d. MMMM'ta 'yyyy", // long date pattern
|
||||
"d. MMMM yyyy", // full date pattern
|
||||
"d. MMMM yyyy", // long date pattern
|
||||
"d.M.yyyy", // medium date pattern
|
||||
"d.M.yyyy", // short date pattern
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user