stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8172527: Rename jdk.crypto.token to jdk.crypto.cryptoki

Browse Source 
Reviewed-by: mchung, wetmore
This commit is contained in:
Anthony Scarpino 2017-01-23 11:49:50 -08:00
parent b99aeee96a
commit 946541ac57
5 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
common/bin/unshuffle_list.txt
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # 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/ECC_JNI.cpp : jdk/src/share/native/s
jdk/src/jdk.crypto.ec/share/native/libsunec/impl : jdk/src/share/native/sun/security/ec/impl 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/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.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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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.cryptoki/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/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.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/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 jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof

116
common/nb_native/nbproject/configurations.xml
View File

@ -2166,7 +2166,7 @@
</df> </df>
</df> </df>
</df> </df>
<df name="jdk.crypto.token"> <df name="jdk.crypto.cryptoki">
<df name="share"> <df name="share">
<df name="native"> <df name="native">
<df name="libj2pkcs11"> <df name="libj2pkcs11">
@ -29422,35 +29422,35 @@
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c" <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c" <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="2"> flavor2="2">
@ -29460,63 +29460,63 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c" <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c" <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
@ -31752,7 +31752,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.token"> <folder path="0/jdk/src/jdk.crypto.cryptoki">
<cTool> <cTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -31760,10 +31760,10 @@
<pElem>../../jdk/src/java.base/unix/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/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/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.cryptoki/share/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem> <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/java.base/macosx/native/libjava</pElem> <pElem>../../jdk/src/java.base/macosx/native/libjava</pElem>
<pElem>../../build/support/headers/jdk.crypto.token</pElem> <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
<preprocessorList> <preprocessorList>
@ -31772,7 +31772,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.token/unix"> <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
<cTool> <cTool>
<preprocessorList> <preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem> <Elem>THIS_FILE="j2secmod_md.c"</Elem>
@ -44741,14 +44741,14 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c" <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
<cTool flags="4"> <cTool flags="4">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c" <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44758,7 +44758,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44768,7 +44768,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44778,7 +44778,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44788,7 +44788,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44798,7 +44798,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44808,7 +44808,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44818,7 +44818,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44828,7 +44828,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44838,7 +44838,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44848,7 +44848,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44858,14 +44858,14 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c" <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
<cTool flags="4"> <cTool flags="4">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c" <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -47795,7 +47795,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.token"> <folder path="0/jdk/src/jdk.crypto.cryptoki">
<cTool> <cTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -47803,10 +47803,10 @@
<pElem>../../jdk/src/java.base/unix/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/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/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.cryptoki/share/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem> <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../build/support/headers/jdk.crypto.token</pElem> <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
<preprocessorList> <preprocessorList>
@ -47815,7 +47815,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.token/unix"> <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
<cTool> <cTool>
<preprocessorList> <preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem> <Elem>THIS_FILE="j2secmod_md.c"</Elem>
@ -62728,14 +62728,14 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c" <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
<cTool flags="2"> <cTool flags="2">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c" <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62745,7 +62745,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62755,7 +62755,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62765,7 +62765,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62775,7 +62775,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62785,7 +62785,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62795,7 +62795,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62805,7 +62805,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62815,7 +62815,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62825,7 +62825,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62835,7 +62835,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </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" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62845,14 +62845,14 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c" <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
<cTool flags="2"> <cTool flags="2">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c" <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -66281,7 +66281,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.token"> <folder path="0/jdk/src/jdk.crypto.cryptoki">
<cTool> <cTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -66289,10 +66289,10 @@
<pElem>../../jdk/src/java.base/unix/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/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/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.cryptoki/share/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem> <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/java.base/solaris/native/libjava</pElem> <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
<pElem>../../build/support/headers/jdk.crypto.token</pElem> <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
<preprocessorList> <preprocessorList>
@ -66301,7 +66301,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.token/unix"> <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
<cTool> <cTool>
<preprocessorList> <preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem> <Elem>THIS_FILE="j2secmod_md.c"</Elem>

4
make/Images.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -52,7 +52,7 @@ JRE_COMPACT1_MODULES := \
java.logging \ java.logging \
java.scripting \ java.scripting \
jdk.localedata \ jdk.localedata \
jdk.crypto.token \ jdk.crypto.cryptoki \
jdk.crypto.ec \ jdk.crypto.ec \
jdk.unsupported \ jdk.unsupported \
# #

6
make/ZipSecurity.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -43,8 +43,8 @@ $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
modules/java.base/com/sun/crypto/provider \ modules/java.base/com/sun/crypto/provider \
modules/jdk.crypto.ec/sun/security/ec \ modules/jdk.crypto.ec/sun/security/ec \
modules/jdk.crypto.mscapi/sun/security/mscapi \ modules/jdk.crypto.mscapi/sun/security/mscapi \
modules/jdk.crypto.token/sun/security/pkcs11 \ modules/jdk.crypto.cryptoki/sun/security/pkcs11 \
modules/jdk.crypto.token/sun/security/pkcs11/wrapper \ modules/jdk.crypto.cryptoki/sun/security/pkcs11/wrapper \
modules/jdk.crypto.ucrypto/com/oracle/security/ucrypto \ modules/jdk.crypto.ucrypto/com/oracle/security/ucrypto \
modules/java.base/javax/net \ modules/java.base/javax/net \
modules/java.base/javax/security/cert \ modules/java.base/javax/security/cert \

4
make/common/Modules.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -104,7 +104,7 @@ PLATFORM_MODULES += \
jdk.accessibility \ jdk.accessibility \
jdk.charsets \ jdk.charsets \
jdk.crypto.ec \ jdk.crypto.ec \
jdk.crypto.token \ jdk.crypto.cryptoki \
jdk.desktop \ jdk.desktop \
jdk.dynalink \ jdk.dynalink \
jdk.jsobject \ jdk.jsobject \