8244154: Update SunPKCS11 provider with PKCS11 v3.0 header files

Backport-of: 7d8985243d472db19dd416a5d9fe116737d3b327

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -48,7 +48,7 @@
 package sun.security.pkcs11.wrapper;
 
 import java.util.*;
-
+import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
 
 /**
  * This is the superclass of all checked exceptions used by this package. An
@@ -73,101 +73,105 @@ public class PKCS11Exception extends Exception {
     private static final Map<Long,String> errorMap;
 
     static {
-        int[] errorCodes = new int[] {
-            0x00000000,
-            0x00000001,
-            0x00000002,
-            0x00000003,
-            0x00000005,
-            0x00000006,
-            0x00000007,
-            0x00000008,
-            0x00000009,
-            0x0000000A,
-            0x00000010,
-            0x00000011,
-            0x00000012,
-            0x00000013,
-            0x0000001B,
-            0x00000020,
-            0x00000021,
-            0x00000030,
-            0x00000031,
-            0x00000032,
-            0x00000040,
-            0x00000041,
-            0x00000050,
-            0x00000051,
-            0x00000054,
-            0x00000060,
-            0x00000062,
-            0x00000063,
-            0x00000064,
-            0x00000065,
-            0x00000066,
-            0x00000067,
-            0x00000068,
-            0x00000069,
-            0x0000006A,
-            0x00000070,
-            0x00000071,
-            0x00000082,
-            0x00000090,
-            0x00000091,
-            0x000000A0,
-            0x000000A1,
-            0x000000A2,
-            0x000000A3,
-            0x000000A4,
-            0x000000B0,
-            0x000000B1,
-            0x000000B3,
-            0x000000B4,
-            0x000000B5,
-            0x000000B6,
-            0x000000B7,
-            0x000000B8,
-            0x000000C0,
-            0x000000C1,
-            0x000000D0,
-            0x000000D1,
-            0x000000E0,
-            0x000000E1,
-            0x000000E2,
-            0x000000F0,
-            0x000000F1,
-            0x000000F2,
-            0x00000100,
-            0x00000101,
-            0x00000102,
-            0x00000103,
-            0x00000104,
-            0x00000105,
-            0x00000110,
-            0x00000112,
-            0x00000113,
-            0x00000114,
-            0x00000115,
-            0x00000120,
-            0x00000121,
-            0x00000130,
-            0x00000150,
-            0x00000160,
-            0x00000170,
-            0x00000180,
-            0x00000190,
-            0x00000191,
-            0x000001A0,
-            0x000001A1,
-            0x000001B0,
-            0x000001B1,
-            0x000001B5,
-            0x000001B6,
-            0x000001B7,
-            0x000001B8,
-            0x000001B9,
-            0x00000200,
-            0x80000000,
+        long[] errorCodes = new long[] {
+            CKR_OK,
+            CKR_CANCEL,
+            CKR_HOST_MEMORY,
+            CKR_SLOT_ID_INVALID,
+            CKR_GENERAL_ERROR,
+            CKR_FUNCTION_FAILED,
+            CKR_ARGUMENTS_BAD,
+            CKR_NO_EVENT,
+            CKR_NEED_TO_CREATE_THREADS,
+            CKR_CANT_LOCK,
+            CKR_ATTRIBUTE_READ_ONLY,
+            CKR_ATTRIBUTE_SENSITIVE,
+            CKR_ATTRIBUTE_TYPE_INVALID,
+            CKR_ATTRIBUTE_VALUE_INVALID,
+            CKR_ACTION_PROHIBITED,
+            CKR_DATA_INVALID,
+            CKR_DATA_LEN_RANGE,
+            CKR_DEVICE_ERROR,
+            CKR_DEVICE_MEMORY,
+            CKR_DEVICE_REMOVED,
+            CKR_ENCRYPTED_DATA_INVALID,
+            CKR_ENCRYPTED_DATA_LEN_RANGE,
+            CKR_AEAD_DECRYPT_FAILED,
+            CKR_FUNCTION_CANCELED,
+            CKR_FUNCTION_NOT_PARALLEL,
+            CKR_FUNCTION_NOT_SUPPORTED,
+            CKR_KEY_HANDLE_INVALID,
+            CKR_KEY_SIZE_RANGE,
+            CKR_KEY_TYPE_INCONSISTENT,
+            CKR_KEY_NOT_NEEDED,
+            CKR_KEY_CHANGED,
+            CKR_KEY_NEEDED,
+            CKR_KEY_INDIGESTIBLE,
+            CKR_KEY_FUNCTION_NOT_PERMITTED,
+            CKR_KEY_NOT_WRAPPABLE,
+            CKR_KEY_UNEXTRACTABLE,
+            CKR_MECHANISM_INVALID,
+            CKR_MECHANISM_PARAM_INVALID,
+            CKR_OBJECT_HANDLE_INVALID,
+            CKR_OPERATION_ACTIVE,
+            CKR_OPERATION_NOT_INITIALIZED,
+            CKR_PIN_INCORRECT,
+            CKR_PIN_INVALID,
+            CKR_PIN_LEN_RANGE,
+            CKR_PIN_EXPIRED,
+            CKR_PIN_LOCKED,
+            CKR_SESSION_CLOSED,
+            CKR_SESSION_COUNT,
+            CKR_SESSION_HANDLE_INVALID,
+            CKR_SESSION_PARALLEL_NOT_SUPPORTED,
+            CKR_SESSION_READ_ONLY,
+            CKR_SESSION_EXISTS,
+            CKR_SESSION_READ_ONLY_EXISTS,
+            CKR_SESSION_READ_WRITE_SO_EXISTS,
+            CKR_SIGNATURE_INVALID,
+            CKR_SIGNATURE_LEN_RANGE,
+            CKR_TEMPLATE_INCOMPLETE,
+            CKR_TEMPLATE_INCONSISTENT,
+            CKR_TOKEN_NOT_PRESENT,
+            CKR_TOKEN_NOT_RECOGNIZED,
+            CKR_TOKEN_WRITE_PROTECTED,
+            CKR_UNWRAPPING_KEY_HANDLE_INVALID,
+            CKR_UNWRAPPING_KEY_SIZE_RANGE,
+            CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT,
+            CKR_USER_ALREADY_LOGGED_IN,
+            CKR_USER_NOT_LOGGED_IN,
+            CKR_USER_PIN_NOT_INITIALIZED,
+            CKR_USER_TYPE_INVALID,
+            CKR_USER_ANOTHER_ALREADY_LOGGED_IN,
+            CKR_USER_TOO_MANY_TYPES,
+            CKR_WRAPPED_KEY_INVALID,
+            CKR_WRAPPED_KEY_LEN_RANGE,
+            CKR_WRAPPING_KEY_HANDLE_INVALID,
+            CKR_WRAPPING_KEY_SIZE_RANGE,
+            CKR_WRAPPING_KEY_TYPE_INCONSISTENT,
+            CKR_RANDOM_SEED_NOT_SUPPORTED,
+            CKR_RANDOM_NO_RNG,
+            CKR_DOMAIN_PARAMS_INVALID,
+            CKR_CURVE_NOT_SUPPORTED,
+            CKR_BUFFER_TOO_SMALL,
+            CKR_SAVED_STATE_INVALID,
+            CKR_INFORMATION_SENSITIVE,
+            CKR_STATE_UNSAVEABLE,
+            CKR_CRYPTOKI_NOT_INITIALIZED,
+            CKR_CRYPTOKI_ALREADY_INITIALIZED,
+            CKR_MUTEX_BAD,
+            CKR_MUTEX_NOT_LOCKED,
+            CKR_NEW_PIN_MODE,
+            CKR_NEXT_OTP,
+            CKR_EXCEEDED_MAX_ITERATIONS,
+            CKR_FIPS_SELF_TEST_FAILED,
+            CKR_LIBRARY_LOAD_FAILED,
+            CKR_PIN_TOO_WEAK,
+            CKR_PUBLIC_KEY_INVALID,
+            CKR_FUNCTION_REJECTED,
+            CKR_TOKEN_RESOURCE_EXCEEDED,
+            CKR_OPERATION_CANCEL_FAILED,
+            CKR_VENDOR_DEFINED,
         };
         String[] errorMessages = new String[] {
             "CKR_OK",
@@ -192,6 +196,7 @@ public class PKCS11Exception extends Exception {
             "CKR_DEVICE_REMOVED",
             "CKR_ENCRYPTED_DATA_INVALID",
             "CKR_ENCRYPTED_DATA_LEN_RANGE",
+            "CKR_AEAD_DECRYPT_FAILED",
             "CKR_FUNCTION_CANCELED",
             "CKR_FUNCTION_NOT_PARALLEL",
             "CKR_FUNCTION_NOT_SUPPORTED",
@@ -247,6 +252,7 @@ public class PKCS11Exception extends Exception {
             "CKR_RANDOM_SEED_NOT_SUPPORTED",
             "CKR_RANDOM_NO_RNG",
             "CKR_DOMAIN_PARAMS_INVALID",
+            "CKR_CURVE_NOT_SUPPORTED",
             "CKR_BUFFER_TOO_SMALL",
             "CKR_SAVED_STATE_INVALID",
             "CKR_INFORMATION_SENSITIVE",
@@ -263,6 +269,8 @@ public class PKCS11Exception extends Exception {
             "CKR_PIN_TOO_WEAK",
             "CKR_PUBLIC_KEY_INVALID",
             "CKR_FUNCTION_REJECTED",
+            "CKR_TOKEN_RESOURCE_EXCEEDED",
+            "CKR_OPERATION_CANCEL_FAILED",
             "CKR_VENDOR_DEFINED",
         };
         errorMap = new HashMap<Long,String>();

src/jdk.crypto.cryptoki/share/legal/pkcs11cryptotoken.md

@@ -1,32 +1,72 @@
-## OASIS PKCS #11 Cryptographic Token Interface v2.40
+## OASIS PKCS #11 Cryptographic Token Interface v3.0
 
 ### OASIS PKCS #11 Cryptographic Token Interface License
-```
-
-Copyright (c) OASIS Open 2016. All Rights Reserved.
-
-All capitalized terms in the following text have the meanings assigned to them in the OASIS
-Intellectual Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the
-OASIS website: [http://www.oasis-open.org/policies-guidelines/ipr]
-
-This document and translations of it may be copied and furnished to others, and derivative works
-that comment on or otherwise explain it or assist in its implementation may be prepared, copied,
-published, and distributed, in whole or in part, without restriction of any kind, provided that
-the above copyright notice and this section are included on all such copies and derivative works.
-However, this document itself may not be modified in any way, including by removing the copyright
-notice or references to OASIS, except as needed for the purpose of developing any document or
-deliverable produced by an OASIS Technical Committee (in which case the rules applicable to
-copyrights, as set forth in the OASIS IPR Policy, must be followed) or as required to translate it
-into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its
-successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS
-DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE
-USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR
-ANY PART THEREOF.
-
-```
+<pre>
+
+Copyright © OASIS Open 2020. All Rights Reserved.
+
+    All capitalized terms in the following text have the meanings
+assigned to them in the OASIS Intellectual Property Rights Policy (the
+"OASIS IPR Policy"). The full Policy may be found at the OASIS website:
+[http://www.oasis-open.org/policies-guidelines/ipr]
+
+    This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or
+assist in its implementation may be prepared, copied, published, and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this section are included
+on all such copies and derivative works. However, this document itself
+may not be modified in any way, including by removing the copyright
+notice or references to OASIS, except as needed for the purpose of
+developing any document or deliverable produced by an OASIS Technical
+Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to
+translate it into languages other than English.
+
+    The limited permissions granted above are perpetual and will not be
+revoked by OASIS or its successors or assigns.
+
+    This document and the information contained herein is provided on an
+"AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS
+AND ITS MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS DOCUMENT OR ANY
+PART THEREOF.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
+
+</pre>