--- a/common/bin/unshuffle_list.txt Mon Jan 23 23:56:02 2017 +0100
+++ b/common/bin/unshuffle_list.txt Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, 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
@@ -1266,33 +1266,33 @@
jdk/src/jdk.crypto.ec/share/native/libsunec/impl : jdk/src/share/native/sun/security/ec/impl
jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi : jdk/src/windows/classes/sun/security/mscapi
jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi : jdk/src/windows/native/sun/security/mscapi
-jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
-jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
-jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
-jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
-jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h
-jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
-jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
-jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
-jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
+jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
+jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
+jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
+jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h
+jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
+jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
+jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
+jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
jdk/src/java.desktop/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m
jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof
--- a/common/nb_native/nbproject/configurations.xml Mon Jan 23 23:56:02 2017 +0100
+++ b/common/nb_native/nbproject/configurations.xml Wed Jul 05 22:44:04 2017 +0200
@@ -2166,7 +2166,7 @@
</df>
</df>
</df>
- <df name="jdk.crypto.token">
+ <df name="jdk.crypto.cryptoki">
<df name="share">
<df name="native">
<df name="libj2pkcs11">
@@ -29422,35 +29422,35 @@
<cTool flags="5">
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
ex="false"
tool="0"
flavor2="2">
@@ -29460,63 +29460,63 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
ex="false"
tool="0"
flavor2="3">
@@ -31752,18 +31752,18 @@
</preprocessorList>
</ccTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token">
- <cTool>
- <incDir>
- <pElem>../../jdk/src/java.base/share/native/include</pElem>
- <pElem>../../jdk/src/java.base/macosx/native/include</pElem>
- <pElem>../../jdk/src/java.base/unix/native/include</pElem>
- <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
- <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/java.base/macosx/native/libjava</pElem>
- <pElem>../../build/support/headers/jdk.crypto.token</pElem>
+ <folder path="0/jdk/src/jdk.crypto.cryptoki">
+ <cTool>
+ <incDir>
+ <pElem>../../jdk/src/java.base/share/native/include</pElem>
+ <pElem>../../jdk/src/java.base/macosx/native/include</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/include</pElem>
+ <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/java.base/macosx/native/libjava</pElem>
+ <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
<pElem>../../make</pElem>
</incDir>
<preprocessorList>
@@ -31772,7 +31772,7 @@
</preprocessorList>
</cTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token/unix">
+ <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
<cTool>
<preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem>
@@ -44741,14 +44741,14 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c"
- ex="false"
- tool="0"
- flavor2="0">
- <cTool flags="4">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
+ ex="false"
+ tool="0"
+ flavor2="0">
+ <cTool flags="4">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
ex="false"
tool="0"
flavor2="0">
@@ -44758,7 +44758,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
ex="false"
tool="0"
flavor2="0">
@@ -44768,7 +44768,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
ex="false"
tool="0"
flavor2="0">
@@ -44778,7 +44778,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
ex="false"
tool="0"
flavor2="0">
@@ -44788,7 +44788,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
ex="false"
tool="0"
flavor2="0">
@@ -44798,7 +44798,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -44808,7 +44808,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
ex="false"
tool="0"
flavor2="0">
@@ -44818,7 +44818,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -44828,7 +44828,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -44838,7 +44838,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
ex="false"
tool="0"
flavor2="0">
@@ -44848,7 +44848,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
ex="false"
tool="0"
flavor2="0">
@@ -44858,14 +44858,14 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c"
- ex="false"
- tool="0"
- flavor2="0">
- <cTool flags="4">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
+ ex="false"
+ tool="0"
+ flavor2="0">
+ <cTool flags="4">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
ex="false"
tool="0"
flavor2="0">
@@ -47795,18 +47795,18 @@
</preprocessorList>
</ccTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token">
- <cTool>
- <incDir>
- <pElem>../../jdk/src/java.base/share/native/include</pElem>
- <pElem>../../jdk/src/java.base/linux/native/include</pElem>
- <pElem>../../jdk/src/java.base/unix/native/include</pElem>
- <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
- <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
- <pElem>../../build/support/headers/jdk.crypto.token</pElem>
+ <folder path="0/jdk/src/jdk.crypto.cryptoki">
+ <cTool>
+ <incDir>
+ <pElem>../../jdk/src/java.base/share/native/include</pElem>
+ <pElem>../../jdk/src/java.base/linux/native/include</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/include</pElem>
+ <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
+ <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
<pElem>../../make</pElem>
</incDir>
<preprocessorList>
@@ -47815,7 +47815,7 @@
</preprocessorList>
</cTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token/unix">
+ <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
<cTool>
<preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem>
@@ -62728,14 +62728,14 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c"
- ex="false"
- tool="0"
- flavor2="0">
- <cTool flags="2">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
+ ex="false"
+ tool="0"
+ flavor2="0">
+ <cTool flags="2">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
ex="false"
tool="0"
flavor2="0">
@@ -62745,7 +62745,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
ex="false"
tool="0"
flavor2="0">
@@ -62755,7 +62755,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
ex="false"
tool="0"
flavor2="0">
@@ -62765,7 +62765,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
ex="false"
tool="0"
flavor2="0">
@@ -62775,7 +62775,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
ex="false"
tool="0"
flavor2="0">
@@ -62785,7 +62785,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -62795,7 +62795,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
ex="false"
tool="0"
flavor2="0">
@@ -62805,7 +62805,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -62815,7 +62815,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -62825,7 +62825,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
ex="false"
tool="0"
flavor2="0">
@@ -62835,7 +62835,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
ex="false"
tool="0"
flavor2="0">
@@ -62845,14 +62845,14 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c"
- ex="false"
- tool="0"
- flavor2="0">
- <cTool flags="2">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
+ ex="false"
+ tool="0"
+ flavor2="0">
+ <cTool flags="2">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
ex="false"
tool="0"
flavor2="0">
@@ -66281,18 +66281,18 @@
</preprocessorList>
</ccTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token">
- <cTool>
- <incDir>
- <pElem>../../jdk/src/java.base/share/native/include</pElem>
- <pElem>../../jdk/src/java.base/solaris/native/include</pElem>
- <pElem>../../jdk/src/java.base/unix/native/include</pElem>
- <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
- <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
- <pElem>../../build/support/headers/jdk.crypto.token</pElem>
+ <folder path="0/jdk/src/jdk.crypto.cryptoki">
+ <cTool>
+ <incDir>
+ <pElem>../../jdk/src/java.base/share/native/include</pElem>
+ <pElem>../../jdk/src/java.base/solaris/native/include</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/include</pElem>
+ <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
+ <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
<pElem>../../make</pElem>
</incDir>
<preprocessorList>
@@ -66301,7 +66301,7 @@
</preprocessorList>
</cTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token/unix">
+ <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
<cTool>
<preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem>
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Mon Jan 23 23:56:02 2017 +0100
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Wed Jul 05 22:44:04 2017 +0200
@@ -1025,16 +1025,20 @@
static int skip_annotation_value(const u1*, int, int); // fwd decl
+// Safely increment index by val if does not pass limit
+#define SAFE_ADD(index, limit, val) \
+if (index >= limit - val) return limit; \
+index += val;
+
// Skip an annotation. Return >=limit if there is any problem.
static int skip_annotation(const u1* buffer, int limit, int index) {
assert(buffer != NULL, "invariant");
// annotation := atype:u2 do(nmem:u2) {member:u2 value}
// value := switch (tag:u1) { ... }
- index += 2; // skip atype
- if ((index += 2) >= limit) return limit; // read nmem
+ SAFE_ADD(index, limit, 4); // skip atype and read nmem
int nmem = Bytes::get_Java_u2((address)buffer + index - 2);
while (--nmem >= 0 && index < limit) {
- index += 2; // skip member
+ SAFE_ADD(index, limit, 2); // skip member
index = skip_annotation_value(buffer, limit, index);
}
return index;
@@ -1052,7 +1056,7 @@
// case @: annotation;
// case s: s_con:u2;
// }
- if ((index += 1) >= limit) return limit; // read tag
+ SAFE_ADD(index, limit, 1); // read tag
const u1 tag = buffer[index - 1];
switch (tag) {
case 'B':
@@ -1065,14 +1069,14 @@
case 'J':
case 'c':
case 's':
- index += 2; // skip con or s_con
+ SAFE_ADD(index, limit, 2); // skip con or s_con
break;
case 'e':
- index += 4; // skip e_class, e_name
+ SAFE_ADD(index, limit, 4); // skip e_class, e_name
break;
case '[':
{
- if ((index += 2) >= limit) return limit; // read nval
+ SAFE_ADD(index, limit, 2); // read nval
int nval = Bytes::get_Java_u2((address)buffer + index - 2);
while (--nval >= 0 && index < limit) {
index = skip_annotation_value(buffer, limit, index);
@@ -1101,8 +1105,8 @@
assert(loader_data != NULL, "invariant");
// annotations := do(nann:u2) {annotation}
- int index = 0;
- if ((index += 2) >= limit) return; // read nann
+ int index = 2; // read nann
+ if (index >= limit) return;
int nann = Bytes::get_Java_u2((address)buffer + index - 2);
enum { // initial annotation layout
atype_off = 0, // utf8 such as 'Ljava/lang/annotation/Retention;'
@@ -1121,7 +1125,8 @@
s_size = 9,
min_size = 6 // smallest possible size (zero members)
};
- while ((--nann) >= 0 && (index - 2 + min_size <= limit)) {
+ // Cannot add min_size to index in case of overflow MAX_INT
+ while ((--nann) >= 0 && (index - 2 <= limit - min_size)) {
int index0 = index;
index = skip_annotation(buffer, limit, index);
const u1* const abase = buffer + index0;
@@ -1253,13 +1258,14 @@
runtime_visible_annotations_length = attribute_length;
runtime_visible_annotations = cfs->get_u1_buffer();
assert(runtime_visible_annotations != NULL, "null visible annotations");
+ cfs->guarantee_more(runtime_visible_annotations_length, CHECK);
parse_annotations(cp,
runtime_visible_annotations,
runtime_visible_annotations_length,
parsed_annotations,
_loader_data,
CHECK);
- cfs->skip_u1(runtime_visible_annotations_length, CHECK);
+ cfs->skip_u1_fast(runtime_visible_annotations_length);
} else if (attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
if (runtime_invisible_annotations_exists) {
classfile_parse_error(
@@ -2574,13 +2580,14 @@
runtime_visible_annotations_length = method_attribute_length;
runtime_visible_annotations = cfs->get_u1_buffer();
assert(runtime_visible_annotations != NULL, "null visible annotations");
+ cfs->guarantee_more(runtime_visible_annotations_length, CHECK_NULL);
parse_annotations(cp,
runtime_visible_annotations,
runtime_visible_annotations_length,
&parsed_annotations,
_loader_data,
CHECK_NULL);
- cfs->skip_u1(runtime_visible_annotations_length, CHECK_NULL);
+ cfs->skip_u1_fast(runtime_visible_annotations_length);
} else if (method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
if (runtime_invisible_annotations_exists) {
classfile_parse_error(
@@ -3285,13 +3292,14 @@
runtime_visible_annotations_length = attribute_length;
runtime_visible_annotations = cfs->get_u1_buffer();
assert(runtime_visible_annotations != NULL, "null visible annotations");
+ cfs->guarantee_more(runtime_visible_annotations_length, CHECK);
parse_annotations(cp,
runtime_visible_annotations,
runtime_visible_annotations_length,
parsed_annotations,
_loader_data,
CHECK);
- cfs->skip_u1(runtime_visible_annotations_length, CHECK);
+ cfs->skip_u1_fast(runtime_visible_annotations_length);
} else if (tag == vmSymbols::tag_runtime_invisible_annotations()) {
if (runtime_invisible_annotations_exists) {
classfile_parse_error(
--- a/hotspot/src/share/vm/classfile/stackMapFrame.cpp Mon Jan 23 23:56:02 2017 +0100
+++ b/hotspot/src/share/vm/classfile/stackMapFrame.cpp Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -155,47 +155,8 @@
return i;
}
-bool StackMapFrame::has_flag_match_exception(
- const StackMapFrame* target) const {
- // We allow flags of {UninitThis} to assign to {} if-and-only-if the
- // target frame does not depend upon the current type.
- // This is slightly too strict, as we need only enforce that the
- // slots that were initialized by the <init> (the things that were
- // UninitializedThis before initialize_object() converted them) are unused.
- // However we didn't save that information so we'll enforce this upon
- // anything that might have been initialized. This is a rare situation
- // and javac never generates code that would end up here, but some profilers
- // (such as NetBeans) might, when adding exception handlers in <init>
- // methods to cover the invokespecial instruction. See 7020118.
-
- assert(max_locals() == target->max_locals() &&
- stack_size() == target->stack_size(), "StackMap sizes must match");
-
- VerificationType top = VerificationType::top_type();
- VerificationType this_type = verifier()->current_type();
-
- if (!flag_this_uninit() || target->flags() != 0) {
- return false;
- }
-
- for (int i = 0; i < target->locals_size(); ++i) {
- if (locals()[i] == this_type && target->locals()[i] != top) {
- return false;
- }
- }
-
- for (int i = 0; i < target->stack_size(); ++i) {
- if (stack()[i] == this_type && target->stack()[i] != top) {
- return false;
- }
- }
-
- return true;
-}
-
bool StackMapFrame::is_assignable_to(
- const StackMapFrame* target, bool is_exception_handler,
- ErrorContext* ctx, TRAPS) const {
+ const StackMapFrame* target, ErrorContext* ctx, TRAPS) const {
if (_max_locals != target->max_locals()) {
*ctx = ErrorContext::locals_size_mismatch(
_offset, (StackMapFrame*)this, (StackMapFrame*)target);
@@ -226,8 +187,7 @@
return false;
}
- bool match_flags = (_flags | target->flags()) == target->flags();
- if (match_flags || is_exception_handler && has_flag_match_exception(target)) {
+ if ((_flags | target->flags()) == target->flags()) {
return true;
} else {
*ctx = ErrorContext::bad_flags(target->offset(),
--- a/hotspot/src/share/vm/classfile/stackMapFrame.hpp Mon Jan 23 23:56:02 2017 +0100
+++ b/hotspot/src/share/vm/classfile/stackMapFrame.hpp Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -167,8 +167,7 @@
// Return true if this stack map frame is assignable to target.
bool is_assignable_to(
- const StackMapFrame* target, bool is_exception_handler,
- ErrorContext* ctx, TRAPS) const;
+ const StackMapFrame* target, ErrorContext* ctx, TRAPS) const;
inline void set_mark() {
#ifdef ASSERT
@@ -290,8 +289,6 @@
int is_assignable_to(
VerificationType* src, VerificationType* target, int32_t len, TRAPS) const;
- bool has_flag_match_exception(const StackMapFrame* target) const;
-
TypeOrigin stack_top_ctx();
void print_on(outputStream* str) const;
--- a/hotspot/src/share/vm/classfile/stackMapTable.cpp Mon Jan 23 23:56:02 2017 +0100
+++ b/hotspot/src/share/vm/classfile/stackMapTable.cpp Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -70,26 +70,25 @@
bool StackMapTable::match_stackmap(
StackMapFrame* frame, int32_t target,
- bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const {
+ bool match, bool update, ErrorContext* ctx, TRAPS) const {
int index = get_index_from_offset(target);
- return match_stackmap(frame, target, index, match, update, handler, ctx, THREAD);
+ return match_stackmap(frame, target, index, match, update, ctx, THREAD);
}
// Match and/or update current_frame to the frame in stackmap table with
// specified offset and frame index. Return true if the two frames match.
-// handler is true if the frame in stackmap_table is for an exception handler.
//
-// The values of match and update are: _match__update__handler
+// The values of match and update are: _match__update
//
-// checking a branch target: true false false
-// checking an exception handler: true false true
+// checking a branch target: true false
+// checking an exception handler: true false
// linear bytecode verification following an
-// unconditional branch: false true false
+// unconditional branch: false true
// linear bytecode verification not following an
-// unconditional branch: true true false
+// unconditional branch: true true
bool StackMapTable::match_stackmap(
StackMapFrame* frame, int32_t target, int32_t frame_index,
- bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const {
+ bool match, bool update, ErrorContext* ctx, TRAPS) const {
if (frame_index < 0 || frame_index >= _frame_count) {
*ctx = ErrorContext::missing_stackmap(frame->offset());
frame->verifier()->verify_error(
@@ -102,7 +101,7 @@
if (match) {
// Has direct control flow from last instruction, need to match the two
// frames.
- result = frame->is_assignable_to(stackmap_frame, handler,
+ result = frame->is_assignable_to(stackmap_frame,
ctx, CHECK_VERIFY_(frame->verifier(), result));
}
if (update) {
@@ -126,7 +125,7 @@
StackMapFrame* frame, int32_t target, TRAPS) const {
ErrorContext ctx;
bool match = match_stackmap(
- frame, target, true, false, false, &ctx, CHECK_VERIFY(frame->verifier()));
+ frame, target, true, false, &ctx, CHECK_VERIFY(frame->verifier()));
if (!match || (target < 0 || target >= _code_length)) {
frame->verifier()->verify_error(ctx,
"Inconsistent stackmap frames at branch target %d", target);
--- a/hotspot/src/share/vm/classfile/stackMapTable.hpp Mon Jan 23 23:56:02 2017 +0100
+++ b/hotspot/src/share/vm/classfile/stackMapTable.hpp Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -60,12 +60,12 @@
// specified offset. Return true if the two frames match.
bool match_stackmap(
StackMapFrame* current_frame, int32_t offset,
- bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
+ bool match, bool update, ErrorContext* ctx, TRAPS) const;
// Match and/or update current_frame to the frame in stackmap table with
// specified offset and frame index. Return true if the two frames match.
bool match_stackmap(
StackMapFrame* current_frame, int32_t offset, int32_t frame_index,
- bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
+ bool match, bool update, ErrorContext* ctx, TRAPS) const;
// Check jump instructions. Make sure there are no uninitialized
// instances on backward branch.
--- a/hotspot/src/share/vm/classfile/verifier.cpp Mon Jan 23 23:56:02 2017 +0100
+++ b/hotspot/src/share/vm/classfile/verifier.cpp Wed Jul 05 22:44:04 2017 +0200
@@ -541,19 +541,13 @@
stack_map_frame* sm_frame = sm_table->entries();
streamIndentor si2(ss);
int current_offset = -1;
- // Subtract two from StackMapAttribute length because the length includes
- // two bytes for number of table entries.
- size_t sm_table_space = method->stackmap_data()->length() - 2;
+ address end_of_sm_table = (address)sm_table + method->stackmap_data()->length();
for (u2 i = 0; i < sm_table->number_of_entries(); ++i) {
ss->indent();
- size_t sm_frame_size = sm_frame->size();
- // If the size of the next stackmap exceeds the length of the entire
- // stackmap table then print a truncated message and return.
- if (sm_frame_size > sm_table_space) {
+ if (!sm_frame->verify((address)sm_frame, end_of_sm_table)) {
sm_frame->print_truncated(ss, current_offset);
return;
}
- sm_table_space -= sm_frame_size;
sm_frame->print_on(ss, current_offset);
ss->cr();
current_offset += sm_frame->offset_delta();
@@ -1863,7 +1857,7 @@
// If matched, current_frame will be updated by this method.
bool matches = stackmap_table->match_stackmap(
current_frame, this_offset, stackmap_index,
- !no_control_flow, true, false, &ctx, CHECK_VERIFY_(this, 0));
+ !no_control_flow, true, &ctx, CHECK_VERIFY_(this, 0));
if (!matches) {
// report type error
verify_error(ctx, "Instruction type does not match stack map");
@@ -1913,7 +1907,7 @@
}
ErrorContext ctx;
bool matches = stackmap_table->match_stackmap(
- new_frame, handler_pc, true, false, true, &ctx, CHECK_VERIFY(this));
+ new_frame, handler_pc, true, false, &ctx, CHECK_VERIFY(this));
if (!matches) {
verify_error(ctx, "Stack map does not match the one at "
"exception handler %d", handler_pc);
--- a/hotspot/test/runtime/handlerInTry/LoadHandlerInTry.java Mon Jan 23 23:56:02 2017 +0100
+++ b/hotspot/test/runtime/handlerInTry/LoadHandlerInTry.java Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +24,7 @@
/*
* @test
* @bug 8075118
- * @summary Allow a ctor to call super() from a switch bytecode.
+ * @summary JVM stuck in infinite loop during verification
* @compile HandlerInTry.jasm
* @compile IsolatedHandlerInTry.jasm
* @run main/othervm -Xverify:all LoadHandlerInTry
@@ -70,9 +70,10 @@
System.out.println("Regression test for bug 8075118");
try {
Class newClass = Class.forName("HandlerInTry");
- } catch (Exception e) {
- System.out.println("Failed: Exception was thrown: " + e.toString());
- throw e;
+ throw new RuntimeException(
+ "Failed to throw VerifyError for HandlerInTry");
+ } catch (java.lang.VerifyError e) {
+ System.out.println("Passed: VerifyError exception was thrown");
}
try {
--- a/make/Images.gmk Mon Jan 23 23:56:02 2017 +0100
+++ b/make/Images.gmk Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, 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
@@ -52,7 +52,7 @@
java.logging \
java.scripting \
jdk.localedata \
- jdk.crypto.token \
+ jdk.crypto.cryptoki \
jdk.crypto.ec \
jdk.unsupported \
#
--- a/make/InitSupport.gmk Mon Jan 23 23:56:02 2017 +0100
+++ b/make/InitSupport.gmk Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, 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
@@ -460,27 +460,28 @@
endef
define PrintFailureReports
- $(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*), \
- $(PRINTF) "=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \
- $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*)), \
+ $(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log), \
+ $(PRINTF) "\n=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \
+ $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log)), \
$(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" $(NEWLINE) \
($(GREP) -v -e "^Note: including file:" < $(logfile) || true) | $(HEAD) -n 12 $(NEWLINE) \
if test `$(WC) -l < $(logfile)` -gt 12; then \
$(ECHO) " ... (rest of output omitted)" ; \
fi $(NEWLINE) \
) \
+ $(PRINTF) "\n* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs.\n" $(NEWLINE) \
$(PRINTF) "=== End of repeated output ===\n" \
)
endef
define PrintBuildLogFailures
if $(GREP) -q "recipe for target .* failed" $(BUILD_LOG) 2> /dev/null; then \
- $(PRINTF) "=== Make failure sequence repeated here ===\n" ; \
+ $(PRINTF) "\n=== Make failed targets repeated here ===\n" ; \
$(GREP) "recipe for target .* failed" $(BUILD_LOG) ; \
$(PRINTF) "=== End of repeated output ===\n" ; \
- $(PRINTF) "Hint: Try searching the build log for the name of the first failed target.\n" ; \
+ $(PRINTF) "\nHint: Try searching the build log for the name of the first failed target.\n" ; \
else \
- $(PRINTF) "No indication of failed target found.\n" ; \
+ $(PRINTF) "\nNo indication of failed target found.\n" ; \
$(PRINTF) "Hint: Try searching the build log for '] Error'.\n" ; \
fi
endef
--- a/make/Javadoc.gmk Mon Jan 23 23:56:02 2017 +0100
+++ b/make/Javadoc.gmk Wed Jul 05 22:44:04 2017 +0200
@@ -683,22 +683,6 @@
TARGETS += $(jdknet)
################################################################################
-
-# TODO: Need to decide when the plugin API is ready to publish as experimental API.
-# This target is temporarily added for internal use for now.
-$(eval $(call SetupJavadocGeneration, jlinkplugins, \
- MODULES := jdk.jlink, \
- PACKAGES := jdk.tools.jlink.plugin, \
- API_ROOT := jdk, \
- DEST_DIR := jlink, \
- TITLE := JLink Plugin API - EXPERIMENTAL, \
- FIRST_COPYRIGHT_YEAR := 2015, \
- DISABLED_DOCLINT := html missing syntax, \
-))
-
-TARGETS += $(jlinkplugins)
-
-################################################################################
# Copy JDWP html file
JDWP_HTML := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html
--- a/make/Main.gmk Mon Jan 23 23:56:02 2017 +0100
+++ b/make/Main.gmk Wed Jul 05 22:44:04 2017 +0200
@@ -247,7 +247,7 @@
define DeclareHotspotGensrcRecipe
hotspot-$1-gensrc:
$$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
- +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f gensrc/GenerateSources.gmk \
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \
JVM_VARIANT=$1)
endef
@@ -255,14 +255,14 @@
define DeclareHotspotLibsRecipe
hotspot-$1-libs:
- +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibraries.gmk \
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
JVM_VARIANT=$1)
endef
$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
hotspot-jsig:
- +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibjsig.gmk)
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk)
hotspot-ide-project:
+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
@@ -285,7 +285,7 @@
# Jigsaw specific data and analysis targets.
generate-summary:
- +($(CD) $(JDK_TOPDIR)/make && $(MAKE) -f GenerateModuleSummary.gmk)
+ +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateModuleSummary.gmk)
ALL_TARGETS += generate-summary
@@ -318,7 +318,7 @@
bootcycle-images:
ifneq ($(COMPILE_TYPE), cross)
$(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
- +$(MAKE) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
+ +$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
else
$(call LogWarn, Boot cycle build disabled when cross compiling)
--- a/make/ZipSecurity.gmk Mon Jan 23 23:56:02 2017 +0100
+++ b/make/ZipSecurity.gmk Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, 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
@@ -43,8 +43,8 @@
modules/java.base/com/sun/crypto/provider \
modules/jdk.crypto.ec/sun/security/ec \
modules/jdk.crypto.mscapi/sun/security/mscapi \
- modules/jdk.crypto.token/sun/security/pkcs11 \
- modules/jdk.crypto.token/sun/security/pkcs11/wrapper \
+ modules/jdk.crypto.cryptoki/sun/security/pkcs11 \
+ modules/jdk.crypto.cryptoki/sun/security/pkcs11/wrapper \
modules/jdk.crypto.ucrypto/com/oracle/security/ucrypto \
modules/java.base/javax/net \
modules/java.base/javax/security/cert \
--- a/make/common/MakeBase.gmk Mon Jan 23 23:56:02 2017 +0100
+++ b/make/common/MakeBase.gmk Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, 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
@@ -862,6 +862,7 @@
( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \
( exitcode=$(DOLLAR)? && \
$(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(BUILD_OUTPUT)/%,%,$(strip $1))).log && \
+ $(CP) $(strip $1).cmdline $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(BUILD_OUTPUT)/%,%,$(strip $1))).cmdline && \
exit $(DOLLAR)exitcode ) )
################################################################################
--- a/make/common/Modules.gmk Mon Jan 23 23:56:02 2017 +0100
+++ b/make/common/Modules.gmk Wed Jul 05 22:44:04 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, 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
@@ -104,7 +104,7 @@
jdk.accessibility \
jdk.charsets \
jdk.crypto.ec \
- jdk.crypto.token \
+ jdk.crypto.cryptoki \
jdk.desktop \
jdk.dynalink \
jdk.jsobject \
--- a/test/lib/jdk/test/lib/SecurityTools.java Mon Jan 23 23:56:02 2017 +0100
+++ b/test/lib/jdk/test/lib/SecurityTools.java Wed Jul 05 22:44:04 2017 +0200
@@ -23,102 +23,97 @@
package jdk.test.lib;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
public class SecurityTools {
- public static final String NO_ALIAS = null;
+ public static final String RESPONSE_FILE = "security_tools_response.txt";
+
+ private static ProcessBuilder getProcessBuilder(String tool, List<String> args) {
+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(tool)
+ .addVMArg("-Duser.language=en")
+ .addVMArg("-Duser.country=US")
+ .addVMArg("-Djava.security.egd=file:/dev/./urandom");
+ for (String arg : args) {
+ if (arg.startsWith("-J")) {
+ launcher.addVMArg(arg.substring(2));
+ } else {
+ launcher.addToolArg(arg);
+ }
+ }
+ String[] cmds = launcher.getCommand();
+ String cmdLine = Arrays.stream(cmds).collect(Collectors.joining(" "));
+ System.out.println("Command line: [" + cmdLine + "]");
+ return new ProcessBuilder(cmds);
+ }
// keytool
- public static OutputAnalyzer keytool(List<String> options)
- throws Throwable {
+ public static OutputAnalyzer keytool(List<String> args)
+ throws Exception {
+
+ ProcessBuilder pb = getProcessBuilder("keytool", args);
- JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("keytool")
- .addVMArg("-Duser.language=en")
- .addVMArg("-Duser.country=US");
- for (String option : options) {
- if (option.startsWith("-J")) {
- launcher.addVMArg(option.substring(2));
- } else {
- launcher.addToolArg(option);
- }
+ Path p = Paths.get(RESPONSE_FILE);
+ if (!Files.exists(p)) {
+ Files.createFile(p);
}
- return ProcessTools.executeCommand(launcher.getCommand());
+ pb.redirectInput(ProcessBuilder.Redirect.from(new File(RESPONSE_FILE)));
+
+ try {
+ return ProcessTools.executeProcess(pb);
+ } finally {
+ Files.delete(p);
+ }
}
- public static OutputAnalyzer keytool(String options) throws Throwable {
- return keytool(options.split("\\s+"));
+ // Only call this if there is no white space in every argument
+ public static OutputAnalyzer keytool(String args) throws Exception {
+ return keytool(args.split("\\s+"));
+ }
+
+ public static OutputAnalyzer keytool(String... args) throws Exception {
+ return keytool(List.of(args));
}
- public static OutputAnalyzer keytool(String... options) throws Throwable {
- return keytool(List.of(options));
+ public static void setResponse(String... responses) throws IOException {
+ String text;
+ if (responses.length > 0) {
+ text = Stream.of(responses).collect(
+ Collectors.joining("\n", "", "\n"));
+ } else {
+ text = "";
+ }
+ Files.write(Paths.get(RESPONSE_FILE), text.getBytes());
}
// jarsigner
- public static OutputAnalyzer jarsigner(String jar, String alias,
- List<String> options) throws Throwable {
- JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jarsigner")
- .addVMArg("-Duser.language=en")
- .addVMArg("-Duser.country=US");
- for (String option : options) {
- if (option.startsWith("-J")) {
- launcher.addVMArg(option.substring(2));
- } else {
- launcher.addToolArg(option);
- }
- }
- launcher.addToolArg(jar);
- if (alias != null) {
- launcher.addToolArg(alias);
- }
- return ProcessTools.executeCommand(launcher.getCommand());
- }
-
- public static OutputAnalyzer jarsigner(String jar, String alias,
- String options) throws Throwable {
-
- return jarsigner(jar, alias, options.split("\\s+"));
+ public static OutputAnalyzer jarsigner(List<String> args)
+ throws Exception {
+ return ProcessTools.executeProcess(
+ getProcessBuilder("jarsigner", args));
}
- public static OutputAnalyzer jarsigner(String jar, String alias,
- String... options) throws Throwable {
-
- return jarsigner(jar, alias, List.of(options));
- }
+ // Only call this if there is no white space in every argument
+ public static OutputAnalyzer jarsigner(String args) throws Exception {
- public static OutputAnalyzer sign(String jar, String alias, String... options)
- throws Throwable {
-
- return jarsigner(jar, alias,
- mergeOptions("-J-Djava.security.egd=file:/dev/./urandom", options));
+ return jarsigner(args.split("\\s+"));
}
- public static OutputAnalyzer verify(String jar, String... options)
- throws Throwable {
-
- return jarsigner(jar, NO_ALIAS, mergeOptions("-verify", options));
- }
-
- // helper methods
-
- private static List<String> mergeOptions(
- String firstOption, String... secondPart) {
-
- return mergeOptions(List.of(firstOption), secondPart);
- }
-
- private static List<String> mergeOptions(
- List<String> firstPart, String... secondPart) {
-
- List<String> options = new ArrayList<>(firstPart);
- Collections.addAll(options, secondPart);
- return options;
+ public static OutputAnalyzer jarsigner(String... args) throws Exception {
+ return jarsigner(List.of(args));
}
}
--- a/test/lib/jdk/test/lib/process/OutputAnalyzer.java Mon Jan 23 23:56:02 2017 +0100
+++ b/test/lib/jdk/test/lib/process/OutputAnalyzer.java Wed Jul 05 22:44:04 2017 +0200
@@ -183,6 +183,23 @@
}
/**
+ * Verify that the stdout and stderr contents of output buffer does not contain the string
+ *
+ * @throws RuntimeException If the string was found
+ */
+ public OutputAnalyzer shouldBeEmpty() {
+ if (!stdout.isEmpty()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("stdout was not empty");
+ }
+ if (!stderr.isEmpty()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("stderr was not empty");
+ }
+ return this;
+ }
+
+ /**
* Verify that the stdout contents of output buffer does not contain the string
*
* @param expectedString String that the buffer should not contain
@@ -365,6 +382,21 @@
return this;
}
+ /**
+ * Verify the exit value of the process
+ *
+ * @param notExpectedExitValue Unexpected exit value from process
+ * @throws RuntimeException If the exit value from the process did match the expected value
+ */
+ public OutputAnalyzer shouldNotHaveExitValue(int notExpectedExitValue) {
+ if (getExitValue() == notExpectedExitValue) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("Unexpected to get exit value of ["
+ + notExpectedExitValue + "]\n");
+ }
+ return this;
+ }
+
/**
* Report summary that will help to diagnose the problem