--- old/src/jdk.crypto.token/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java	2017-01-20 09:52:42.714288791 -0800
+++ /dev/null	2017-01-18 09:30:05.425422781 -0800
@@ -1,120 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
- *
- * Redistribution and use in  source and binary forms, with or without
- * modification, are permitted  provided that the following conditions are met:
- *
- * 1. Redistributions of  source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in  binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any, must
- *    include the following acknowledgment:
- *
- *    "This product includes software developed by IAIK of Graz University of
- *     Technology."
- *
- *    Alternately, this acknowledgment may appear in the software itself, if
- *    and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Graz University of Technology" and "IAIK of Graz University of
- *    Technology" must not be used to endorse or promote products derived from
- *    this software without prior written permission.
- *
- * 5. Products derived from this software may not be called
- *    "IAIK PKCS Wrapper", nor may "IAIK" appear in their name, without prior
- *    written permission of Graz University of Technology.
- *
- *  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE LICENSOR BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- *  OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- *  OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY  OF SUCH DAMAGE.
- */
-
-package sun.security.pkcs11.wrapper;
-
-
-
-/**
- * class CK_C_INITIALIZE_ARGS contains the optional arguments for the
- * C_Initialize function.<p>
- * <B>PKCS#11 structure:</B>
- * <PRE>
- * typedef struct CK_C_INITIALIZE_ARGS {&nbsp;&nbsp;
- *   CK_CREATEMUTEX CreateMutex;&nbsp;&nbsp;
- *   CK_DESTROYMUTEX DestroyMutex;&nbsp;&nbsp;
- *   CK_LOCKMUTEX LockMutex;&nbsp;&nbsp;
- *   CK_UNLOCKMUTEX UnlockMutex;&nbsp;&nbsp;
- *   CK_FLAGS flags;&nbsp;&nbsp;
- *   CK_VOID_PTR pReserved;&nbsp;&nbsp;
- * } CK_C_INITIALIZE_ARGS;
- * </PRE>
- *
- * @author Karl Scheibelhofer <Karl.Scheibelhofer@iaik.at>
- * @author Martin Schlaeffer <schlaeff@sbox.tugraz.at>
- */
-public class CK_C_INITIALIZE_ARGS {
-
-    /**
-     * <B>PKCS#11:</B>
-     * <PRE>
-     *   CK_CREATEMUTEX CreateMutex;
-     * </PRE>
-     */
-    public CK_CREATEMUTEX  CreateMutex;
-
-    /**
-     * <B>PKCS#11:</B>
-     * <PRE>
-     *   CK_DESTROYMUTEX DestroyMutex;
-     * </PRE>
-     */
-    public CK_DESTROYMUTEX DestroyMutex;
-
-    /**
-     * <B>PKCS#11:</B>
-     * <PRE>
-     *   CK_LOCKMUTEX LockMutex;
-     * </PRE>
-     */
-    public CK_LOCKMUTEX    LockMutex;
-
-    /**
-     * <B>PKCS#11:</B>
-     * <PRE>
-     *   CK_UNLOCKMUTEX UnlockMutex;
-     * </PRE>
-     */
-    public CK_UNLOCKMUTEX  UnlockMutex;
-
-    /**
-     * <B>PKCS#11:</B>
-     * <PRE>
-     *   CK_FLAGS flags;
-     * </PRE>
-     */
-    public long            flags;
-
-    /**
-     * <B>PKCS#11:</B>
-     * <PRE>
-     *   CK_VOID_PTR pReserved;
-     * </PRE>
-     */
-    public Object          pReserved;
-
-}
--- /dev/null	2017-01-18 09:30:05.425422781 -0800
+++ new/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java	2017-01-20 09:52:42.494288799 -0800
@@ -0,0 +1,120 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
+ *
+ * Redistribution and use in  source and binary forms, with or without
+ * modification, are permitted  provided that the following conditions are met:
+ *
+ * 1. Redistributions of  source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in  binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if any, must
+ *    include the following acknowledgment:
+ *
+ *    "This product includes software developed by IAIK of Graz University of
+ *     Technology."
+ *
+ *    Alternately, this acknowledgment may appear in the software itself, if
+ *    and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Graz University of Technology" and "IAIK of Graz University of
+ *    Technology" must not be used to endorse or promote products derived from
+ *    this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called
+ *    "IAIK PKCS Wrapper", nor may "IAIK" appear in their name, without prior
+ *    written permission of Graz University of Technology.
+ *
+ *  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE LICENSOR BE
+ *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *  OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ *  OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *  POSSIBILITY  OF SUCH DAMAGE.
+ */
+
+package sun.security.pkcs11.wrapper;
+
+
+
+/**
+ * class CK_C_INITIALIZE_ARGS contains the optional arguments for the
+ * C_Initialize function.<p>
+ * <B>PKCS#11 structure:</B>
+ * <PRE>
+ * typedef struct CK_C_INITIALIZE_ARGS {&nbsp;&nbsp;
+ *   CK_CREATEMUTEX CreateMutex;&nbsp;&nbsp;
+ *   CK_DESTROYMUTEX DestroyMutex;&nbsp;&nbsp;
+ *   CK_LOCKMUTEX LockMutex;&nbsp;&nbsp;
+ *   CK_UNLOCKMUTEX UnlockMutex;&nbsp;&nbsp;
+ *   CK_FLAGS flags;&nbsp;&nbsp;
+ *   CK_VOID_PTR pReserved;&nbsp;&nbsp;
+ * } CK_C_INITIALIZE_ARGS;
+ * </PRE>
+ *
+ * @author Karl Scheibelhofer <Karl.Scheibelhofer@iaik.at>
+ * @author Martin Schlaeffer <schlaeff@sbox.tugraz.at>
+ */
+public class CK_C_INITIALIZE_ARGS {
+
+    /**
+     * <B>PKCS#11:</B>
+     * <PRE>
+     *   CK_CREATEMUTEX CreateMutex;
+     * </PRE>
+     */
+    public CK_CREATEMUTEX  CreateMutex;
+
+    /**
+     * <B>PKCS#11:</B>
+     * <PRE>
+     *   CK_DESTROYMUTEX DestroyMutex;
+     * </PRE>
+     */
+    public CK_DESTROYMUTEX DestroyMutex;
+
+    /**
+     * <B>PKCS#11:</B>
+     * <PRE>
+     *   CK_LOCKMUTEX LockMutex;
+     * </PRE>
+     */
+    public CK_LOCKMUTEX    LockMutex;
+
+    /**
+     * <B>PKCS#11:</B>
+     * <PRE>
+     *   CK_UNLOCKMUTEX UnlockMutex;
+     * </PRE>
+     */
+    public CK_UNLOCKMUTEX  UnlockMutex;
+
+    /**
+     * <B>PKCS#11:</B>
+     * <PRE>
+     *   CK_FLAGS flags;
+     * </PRE>
+     */
+    public long            flags;
+
+    /**
+     * <B>PKCS#11:</B>
+     * <PRE>
+     *   CK_VOID_PTR pReserved;
+     * </PRE>
+     */
+    public Object          pReserved;
+
+}