diff --git a/src/main/java/org/pkcs11/jacknji11/CKR.java b/src/main/java/org/pkcs11/jacknji11/CKR.java
index 5123d98..8d5cdd1 100644
--- a/src/main/java/org/pkcs11/jacknji11/CKR.java
+++ b/src/main/java/org/pkcs11/jacknji11/CKR.java
@@ -183,9 +183,101 @@ public class CKR {
     public static final long VENDOR_PTK_WLD_LOGIN_CACHE_INCONSISTENT = 0x80002010;
 
     // Thales Luna, from cryptoki_v2.h
+    public static final long VENDOR_LUNA_RC_ERROR = 0x80000004;
+    public static final long VENDOR_LUNA_CONTAINER_HANDLE_INVALID = 0x80000005;
+    public static final long VENDOR_LUNA_TOO_MANY_CONTAINERS = 0x80000006;
+    public static final long VENDOR_LUNA_USER_LOCKED_OUT = 0x80000007;
+    public static final long VENDOR_LUNA_CLONING_PARAMETER_ALREADY_EXISTS = 0x80000008;
+    public static final long VENDOR_LUNA_CLONING_PARAMETER_MISSING = 0x80000009;
+    public static final long VENDOR_LUNA_CERTIFICATE_DATA_MISSING = 0x8000000a;
+    public static final long VENDOR_LUNA_CERTIFICATE_DATA_INVALID = 0x8000000b;
+    public static final long VENDOR_LUNA_ACCEL_DEVICE_ERROR = 0x8000000c;
+    public static final long VENDOR_LUNA_WRAPPING_ERROR = 0x8000000d;
+    public static final long VENDOR_LUNA_UNWRAPPING_ERROR = 0x8000000e;
+    public static final long VENDOR_LUNA_MAC_MISSING = 0x8000000f;
+    public static final long VENDOR_LUNA_DAC_POLICY_PID_MISMATCH = 0x80000010;
+    public static final long VENDOR_LUNA_DAC_MISSING = 0x80000011;
+    public static final long VENDOR_LUNA_BAD_DAC = 0x80000012;
+    public static final long VENDOR_LUNA_SSK_MISSING = 0x80000013;
+    public static final long VENDOR_LUNA_BAD_MAC = 0x80000014;
+    public static final long VENDOR_LUNA_DAK_MISSING = 0x80000015;
+    public static final long VENDOR_LUNA_BAD_DAK = 0x80000016;
+    public static final long VENDOR_LUNA_SIM_AUTHORIZATION_FAILED = 0x80000017;
+    public static final long VENDOR_LUNA_SIM_VERSION_UNSUPPORTED = 0x80000018;
+    public static final long VENDOR_LUNA_SIM_CORRUPT_DATA = 0x80000019;
+    public static final long VENDOR_LUNA_USER_NOT_AUTHORIZED = 0x8000001a;
+    public static final long VENDOR_LUNA_MAX_OBJECT_COUNT_EXCEEDED = 0x8000001b;
+    public static final long VENDOR_LUNA_SO_LOGIN_FAILURE_THRESHOLD = 0x8000001c;
+    public static final long VENDOR_LUNA_SIM_AUTHFORM_INVALID = 0x8000001d;
+    public static final long VENDOR_LUNA_CITS_DAK_MISSING = 0x8000001e;
+    public static final long VENDOR_LUNA_UNABLE_TO_CONNECT = 0x8000001f;
+    public static final long VENDOR_LUNA_PARTITION_DISABLED = 0x80000020;
+    public static final long VENDOR_LUNA_CALLBACK_ERROR = 0x80000021;
+    public static final long VENDOR_LUNA_SECURITY_PARAMETER_MISSING = 0x80000022;
+    public static final long VENDOR_LUNA_SP_TIMEOUT = 0x80000023;
+    public static final long VENDOR_LUNA_TIMEOUT = 0x80000024;
+    public static final long VENDOR_LUNA_ECC_UNKNOWN_CURVE = 0x80000025;
+    public static final long VENDOR_LUNA_MTK_ZEROIZED = 0x80000026;
+    public static final long VENDOR_LUNA_MTK_STATE_INVALID = 0x80000027;
+    public static final long VENDOR_LUNA_INVALID_ENTRY_TYPE = 0x80000028;
+    public static final long VENDOR_LUNA_MTK_SPLIT_INVALID = 0x80000029;
+    public static final long VENDOR_LUNA_HSM_STORAGE_FULL = 0x8000002a;
+    public static final long VENDOR_LUNA_DEVICE_TIMEOUT = 0x8000002b;
+    public static final long VENDOR_LUNA_CONTAINER_OBJECT_STORAGE_FULL = 0x8000002c;
+    public static final long VENDOR_LUNA_PED_CLIENT_NOT_RUNNING = 0x8000002d;
+    public static final long VENDOR_LUNA_PED_UNPLUGGED = 0x8000002e;
+    public static final long VENDOR_LUNA_ECC_POINT_INVALID = 0x8000002f;
+    public static final long VENDOR_LUNA_OPERATION_NOT_ALLOWED = 0x80000030;
+    public static final long VENDOR_LUNA_LICENSE_CAPACITY_EXCEEDED = 0x80000031;
+    public static final long VENDOR_LUNA_LOG_FILE_NOT_OPEN = 0x80000032;
+    public static final long VENDOR_LUNA_LOG_FILE_WRITE_ERROR = 0x80000033;
+    public static final long VENDOR_LUNA_LOG_BAD_FILE_NAME = 0x80000034;
+    public static final long VENDOR_LUNA_LOG_FULL = 0x80000035;
+    public static final long VENDOR_LUNA_LOG_NO_KCV = 0x80000036;
+    public static final long VENDOR_LUNA_LOG_BAD_RECORD_HMAC = 0x80000037;
+    public static final long VENDOR_LUNA_LOG_BAD_TIME = 0x80000038;
+    public static final long VENDOR_LUNA_LOG_AUDIT_NOT_INITIALIZED = 0x80000039;
+    public static final long VENDOR_LUNA_LOG_RESYNC_NEEDED = 0x8000003a;
+    public static final long VENDOR_LUNA_AUDIT_LOGIN_TIMEOUT_IN_PROGRESS = 0x8000003b;
+    public static final long VENDOR_LUNA_AUDIT_LOGIN_FAILURE_THRESHOLD = 0x8000003c;
+    public static final long VENDOR_LUNA_INVALID_FUF_TARGET = 0x8000003d;
+    public static final long VENDOR_LUNA_INVALID_FUF_HEADER = 0x8000003e;
+    public static final long VENDOR_LUNA_INVALID_FUF_VERSION = 0x8000003f;
+    public static final long VENDOR_LUNA_ECC_ECC_RESULT_AT_INF = 0x80000040;
+    public static final long VENDOR_LUNA_AGAIN = 0x80000041;
+    public static final long VENDOR_LUNA_TOKEN_COPIED = 0x80000042;
+    public static final long VENDOR_LUNA_SLOT_NOT_EMPTY = 0x80000043;
+    public static final long VENDOR_LUNA_USER_ALREADY_ACTIVATED = 0x80000044;
+    public static final long VENDOR_LUNA_FM_ID_INVALID = 0x80000088;
+    public static final long VENDOR_LUNA_FM_NOT_SUPPORTED = 0x80000089;
+    public static final long VENDOR_LUNA_FM_NEVER_ENABLED = 0x8000008a;
+    public static final long VENDOR_LUNA_FM_DISABLED = 0x8000008b;
+    public static final long VENDOR_LUNA_FM_SMFS_INACTIVE = 0x8000008c;
     public static final long VENDOR_LUNA_HSM_RESTART_REQUIRED = 0x8000008d;
     public static final long VENDOR_LUNA_FM_CFG_ALLOWEDFLAG_DISABLED = 0x8000008e;
     public static final long VENDOR_LUNA_ASSIGNED_KEY_REQUIRES_AUTH_DATA = 0x8000008f;
+    public static final long VENDOR_LUNA_ROLE_CANNOT_MAKE_KEYS_ASSIGNED = 0x80000090;
+    public static final long VENDOR_LUNA_ASSIGNED_KEY_CANNOT_BE_MODIFIED = 0x80000091;
+    public static final long VENDOR_LUNA_AUTH_DATA_TOO_LARGE = 0x80000092;
+    public static final long VENDOR_LUNA_AUTH_DATA_TOO_SMALL = 0x80000093;
+    public static final long VENDOR_LUNA_OH_AUTH_DATA_NOT_PROVIDED = 0x80000094;
+    public static final long VENDOR_LUNA_ASSIGNED_KEY_FAILED_ATTRIBUTE_DEPENDENCIES = 0x80000095;
+    public static final long VENDOR_LUNA_KEY_CANNOT_BE_AUTHORIZED = 0x80000096;
+    public static final long VENDOR_LUNA_KEY_NOT_AUTHORIZED = 0x80000097;
+    public static final long VENDOR_LUNA_AUTH_DATA_INCORRECT = 0x80000098;
+    public static final long VENDOR_LUNA_SMK_ID_NOT_FOUND = 0x80000099;
+    public static final long VENDOR_LUNA_INTERNAL_INTEGRITY_ERROR = 0x8000009a;
+    public static final long VENDOR_LUNA_ASSIGNED_KEY_CANNOT_BE_RESET = 0x8000009b;
+    public static final long VENDOR_LUNA_AUTH_DATA_INCORRECT_AND_LIMIT_REACHED = 0x8000009c;
+    public static final long VENDOR_LUNA_PED_UNSUPPORTED = 0x8000009d;
+    public static final long VENDOR_LUNA_PED_ERROR = 0x8000009e;
+    public static final long VENDOR_LUNA_ACCESS_ID_CONFLICT = 0x8000009f;
+    public static final long VENDOR_LUNA_KEY_INVALID_FOR_HA_LOGIN = 0x80000100;
+    public static final long VENDOR_LUNA_KEY_EXTRACTABLE = 0x80000101;
+    public static final long VENDOR_LUNA_AUTH_DATA_NOT_ALLOWED = 0x80000102;
+    public static final long VENDOR_LUNA_ASSIGNED_KEY_NOT_ALLOWED = 0x80000103;
+    public static final long VENDOR_LUNA_INTEGER_OVERFLOW = 0x80000104;
+    public static final long VENDOR_LUNA_ECC_CURVE_NOT_ALLOWED = 0x80000105;
     public static final long VENDOR_LUNA_XTC_ERROR = 0x80001600;
     public static final long VENDOR_LUNA_CONTEXT_INVALID = 0x80001601;
     public static final long VENDOR_LUNA_MAX_SESSION_OBJECT_COUNT = 0x80001602;