james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improvement on sign and object handling.

Browse Source
This commit is contained in:
Alessio Di Mauro
2015-07-31 17:14:16 +02:00
parent 175f0ff42b
commit b4152b8f03
5 changed files with 590 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/objects.c
+64 -31
View File
@@ -59,16 +59,16 @@ static piv_obj_t piv_objects[] = {
{PIV_CERT_OBJ_X509_KM, 1, 0, 0, "X.509 Certificate for Key Management", 0, 0, get_coa, 3}, {PIV_CERT_OBJ_X509_KM, 1, 0, 0, "X.509 Certificate for Key Management", 0, 0, get_coa, 3},
{PIV_CERT_OBJ_LAST, 1, 0, 0, "", 0, 0, get_coa, 4}, {PIV_CERT_OBJ_LAST, 1, 0, 0, "", 0, 0, get_coa, 4},
{PIV_PVTK_OBJ_PIV_AUTH, 1, 0, 0, "Private key for PIV Authentication", 0, 0, get_proa, 0}, {PIV_PVTK_OBJ_PIV_AUTH, 1, 0, 0, "Private key for PIV Authentication", 0, 0, get_proa, 0}, // 9a
{PIV_PVTK_OBJ_CARD_AUTH, 1, 0, 0, "Private key for Card Authentication", 0, 0, get_proa, 1}, {PIV_PVTK_OBJ_CARD_AUTH, 1, 0, 0, "Private key for Card Authentication", 0, 0, get_proa, 1}, // 9e
{PIV_PVTK_OBJ_DS, 1, 0, 0, "Private key for Digital Signature", 0, 0, get_proa, 2}, {PIV_PVTK_OBJ_DS, 1, 0, 0, "Private key for Digital Signature", 0, 0, get_proa, 2}, // 9c
{PIV_PVTK_OBJ_KM, 1, 0, 0, "Prrivate key for Key Management", 0, 0, get_proa, 3}, {PIV_PVTK_OBJ_KM, 1, 0, 0, "Prrivate key for Key Management", 0, 0, get_proa, 3}, // 9d
{PIV_PVTK_OBJ_LAST, 1, 0, 0, "", 0, 0, NULL, 4}, {PIV_PVTK_OBJ_LAST, 1, 0, 0, "", 0, 0, NULL, 4},
{PIV_PUBK_OBJ_PIV_AUTH, 1, 0, 0, "Public key for PIV Authentication", 0, 0, get_proa, 0}, {PIV_PUBK_OBJ_PIV_AUTH, 1, 0, 0, "Public key for PIV Authentication", 0, 0, get_puoa, 0},
{PIV_PUBK_OBJ_CARD_AUTH, 1, 0, 0, "Public key for Card Authentication", 0, 0, get_proa, 1}, {PIV_PUBK_OBJ_CARD_AUTH, 1, 0, 0, "Public key for Card Authentication", 0, 0, get_puoa, 1},
{PIV_PUBK_OBJ_DS, 1, 0, 0, "Public key for Digital Signature", 0, 0, get_proa, 2}, {PIV_PUBK_OBJ_DS, 1, 0, 0, "Public key for Digital Signature", 0, 0, get_puoa, 2},
{PIV_PUBK_OBJ_KM, 1, 0, 0, "Public key for Key Management", 0, 0, get_proa, 3}, {PIV_PUBK_OBJ_KM, 1, 0, 0, "Public key for Key Management", 0, 0, get_puoa, 3},
{PIV_PUBK_OBJ_LAST, 1, 0, 0, "", 0, 0, NULL, 4} {PIV_PUBK_OBJ_LAST, 1, 0, 0, "", 0, 0, NULL, 4}
}; };
@@ -238,6 +238,18 @@ static void get_object_key_id(CK_OBJECT_HANDLE obj, CK_UTF8CHAR_PTR key_id) {
} }
*/ */
static CK_KEY_TYPE get_key_type(EVP_PKEY *key) {
return do_get_key_type(key);
}
static CK_KEY_TYPE get_modulus_bits(EVP_PKEY *key) {
return do_get_rsa_modulus_length(key);
}
static CK_RV get_public_key(EVP_PKEY *key, CK_BYTE_PTR data, CK_ULONG_PTR len) {
return do_get_public_key(key, data, len);
}
/* Get data object attribute */ /* Get data object attribute */
CK_RV get_doa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) { CK_RV get_doa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
CK_BYTE_PTR data; CK_BYTE_PTR data;
@@ -527,31 +539,32 @@ CK_RV get_coa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
/* Get private key object attribute */ /* Get private key object attribute */
CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) { CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
CK_BYTE_PTR data; CK_BYTE_PTR data;
CK_BYTE tmp[64]; CK_BYTE b_tmp[1024];
CK_ULONG ul_tmp; // TODO: fix elsewhere too
CK_ULONG len = 0; CK_ULONG len = 0;
fprintf(stderr, "FOR PRIVATE KEY OBJECT %lu, I WANT ", obj); fprintf(stderr, "FOR PRIVATE KEY OBJECT %lu, I WANT ", obj);
switch (template->type) { switch (template->type) {
case CKA_CLASS: case CKA_CLASS:
fprintf(stderr, "CLASS\n"); fprintf(stderr, "CLASS\n");
len = 1; len = sizeof(CK_ULONG);
tmp[0] = CKO_PRIVATE_KEY; ul_tmp = CKO_PRIVATE_KEY;
data = tmp; data = (CK_BYTE_PTR) &ul_tmp;
break; break;
case CKA_TOKEN: case CKA_TOKEN:
// Technically all these objects are token objects // Technically all these objects are token objects
fprintf(stderr, "TOKEN\n"); fprintf(stderr, "TOKEN\n");
len = 1; len = sizeof(CK_BBOOL);
tmp[0] = piv_objects[obj].token; b_tmp[0] = piv_objects[obj].token;
data = tmp; data = b_tmp;
break; break;
case CKA_PRIVATE: case CKA_PRIVATE:
fprintf(stderr, "PRIVATE\n"); fprintf(stderr, "PRIVATE\n");
len = 1; len = sizeof(CK_BBOOL);
tmp[0] = piv_objects[obj].private; b_tmp[0] = piv_objects[obj].private;
data = tmp; data = b_tmp;
break; break;
case CKA_LABEL: case CKA_LABEL:
@@ -585,12 +598,13 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
// case CKA_ISSUER: // case CKA_ISSUER:
// case CKA_SERIAL_NUMBER: // case CKA_SERIAL_NUMBER:
case CKA_KEY_TYPE: case CKA_KEY_TYPE:
fprintf(stderr, "KEY TYPE TODO\n"); fprintf(stderr, "KEY TYPE\n");
len = 1; len = sizeof(CK_ULONG);
tmp[0] = CKK_RSA; // TODO: just an example ul_tmp = get_key_type(pubkey_objects[piv_objects[obj].sub_id].data); // Getting the info from the pubk
data = tmp; if (ul_tmp == CKK_VENDOR_DEFINED)
return CKR_FUNCTION_FAILED;
data = (CK_BYTE_PTR) &ul_tmp;
break; break;
return CKR_FUNCTION_FAILED;
case CKA_SUBJECT: case CKA_SUBJECT:
fprintf(stderr, "SUBJECT TODO\n"); // Default empty fprintf(stderr, "SUBJECT TODO\n"); // Default empty
@@ -598,9 +612,9 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
case CKA_ID: case CKA_ID:
fprintf(stderr, "ID\n"); fprintf(stderr, "ID\n");
len = 1; len = sizeof(CK_ULONG);
tmp[0] = piv_objects[obj].sub_id; ul_tmp = piv_objects[obj].sub_id;
data = tmp; data = (CK_BYTE_PTR) &ul_tmp;
break; break;
case CKA_SENSITIVE: case CKA_SENSITIVE:
@@ -638,8 +652,27 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
case CKA_END_DATE: case CKA_END_DATE:
fprintf(stderr, "END DATE TODO\n"); // Default empty fprintf(stderr, "END DATE TODO\n"); // Default empty
return CKR_FUNCTION_FAILED; return CKR_FUNCTION_FAILED;
/* case CKA_MODULUS: */
/* case CKA_MODULUS_BITS: */ /*case CKA_MODULUS:*/
case CKA_EC_POINT:
// We're trying to get the key length, get the ec point of the PUBLIC key
// TODO: or just give an error and explicitly fetch the pubk len when needed
fprintf(stderr, "EC_POINT\n");
len = sizeof(b_tmp);
if (get_public_key(pubkey_objects[piv_objects[obj].sub_id].data, b_tmp, &len) != CKR_OK)
return CKR_FUNCTION_FAILED;
data = b_tmp;
break;
case CKA_MODULUS_BITS:
fprintf(stderr, "MODULUS BITS\n");
len = sizeof(CK_ULONG);
ul_tmp = get_modulus_bits(pubkey_objects[piv_objects[obj].sub_id].data); // Getting the info from the pubk
if (ul_tmp == 0)
return CKR_FUNCTION_FAILED;
data = (CK_BYTE_PTR) &ul_tmp;
break;
/* case CKA_PUBLIC_EXPONENT: */ /* case CKA_PUBLIC_EXPONENT: */
/* case CKA_PRIVATE_EXPONENT: */ /* case CKA_PRIVATE_EXPONENT: */
/* case CKA_PRIME_1: */ /* case CKA_PRIME_1: */
@@ -661,9 +694,9 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
/* case CKA_ALWAYS_SENSITIVE: */ /* case CKA_ALWAYS_SENSITIVE: */
case CKA_MODIFIABLE: case CKA_MODIFIABLE:
fprintf(stderr, "MODIFIABLE\n"); fprintf(stderr, "MODIFIABLE\n");
len = 1; len = sizeof(CK_BBOOL);
tmp[0] = piv_objects[obj].modifiable; b_tmp[0] = piv_objects[obj].modifiable;
data = tmp; data = b_tmp;
break; break;
/*case CKA_VENDOR_DEFINED:*/ /*case CKA_VENDOR_DEFINED:*/
ykcs11/openssl_utils.c
+68 -5
View File
@@ -53,6 +53,72 @@ CK_RV do_store_pubk(X509 *cert, EVP_PKEY **key) {
} }
CK_KEY_TYPE do_get_key_type(EVP_PKEY *key) {
switch (key->type) {
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
return CKK_RSA;
case EVP_PKEY_EC:
return CKK_ECDSA;
default:
return CKK_VENDOR_DEFINED; // Actually an error
}
}
CK_ULONG do_get_rsa_modulus_length(EVP_PKEY *key) {
CK_ULONG key_len = 0;
RSA *rsa;
rsa = EVP_PKEY_get1_RSA(key);
if (rsa == NULL)
return 0;
return RSA_size(rsa) * 8; // There is also RSA_bits but only in >= 1.1.0
}
/* #include <stdio.h> */
/* #include <openssl/err.h> */
/* ERR_load_crypto_strings(); */
/* //SSL_load_error_strings(); */
/* fprintf(stderr, "ERROR %s\n", ERR_error_string(ERR_get_error(), NULL)); */
CK_RV do_get_public_key(EVP_PKEY *key, CK_BYTE_PTR data, CK_ULONG_PTR len) {
RSA *rsa;
EC_KEY *eck;
const EC_GROUP *ecg; // Alternatice solution is to get i2d_PUBKEY and manually offset
const EC_POINT *ecp;
point_conversion_form_t pcf = POINT_CONVERSION_UNCOMPRESSED;
switch(key->type) {
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
rsa = EVP_PKEY_get1_RSA(key);
return CKR_FUNCTION_FAILED; // TODO;
break;
case EVP_PKEY_EC:
eck = EVP_PKEY_get1_EC_KEY(key);
ecg = EC_KEY_get0_group(eck);
ecp = EC_KEY_get0_public_key(eck);
if ((*len = EC_POINT_point2oct(ecg, ecp, pcf, data, *len, NULL)) == 0)
return CKR_FUNCTION_FAILED;
break;
default:
return CKR_FUNCTION_FAILED;
}
return CKR_OK;
}
CK_RV free_key(EVP_PKEY *key) { CK_RV free_key(EVP_PKEY *key) {
EVP_PKEY_free(key); EVP_PKEY_free(key);
@@ -60,14 +126,11 @@ CK_RV free_key(EVP_PKEY *key) {
return CKR_OK; return CKR_OK;
} }
/* #include <stdio.h> */
/* #include <openssl/err.h> */
/* ERR_load_crypto_strings(); */
/* //SSL_load_error_strings(); */
CK_RV do_pkcs_t1(CK_BYTE_PTR in, CK_ULONG in_len, CK_BYTE_PTR out, CK_ULONG out_len, CK_ULONG key_len) { CK_RV do_pkcs_t1(CK_BYTE_PTR in, CK_ULONG in_len, CK_BYTE_PTR out, CK_ULONG out_len, CK_ULONG key_len) {
fprintf(stderr, "Apply padding to %lu bytes and get %lu\n", in_len, key_len); fprintf(stderr, "Apply padding to %lu bytes and get %lu\n", in_len, key_len);
// TODO: rand must be seeded first
if (out_len < key_len) if (out_len < key_len)
CKR_BUFFER_TOO_SMALL; CKR_BUFFER_TOO_SMALL;
ykcs11/openssl_utils.h
+6 -2
View File
@@ -4,13 +4,17 @@
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/ec.h>
#include "pkcs11t.h" #include "pkcs11t.h"
CK_RV do_store_cert(CK_BYTE_PTR data, CK_ULONG len, X509 **cert); CK_RV do_store_cert(CK_BYTE_PTR data, CK_ULONG len, X509 **cert);
CK_RV free_cert(X509 *cert); CK_RV free_cert(X509 *cert);
CK_RV do_store_pubk(X509 *cert, EVP_PKEY **key); CK_RV do_store_pubk(X509 *cert, EVP_PKEY **key);
CK_RV free_key(EVP_PKEY *key); CK_KEY_TYPE do_get_key_type(EVP_PKEY *key);
CK_ULONG do_get_rsa_modulus_length(EVP_PKEY *key);
CK_RV do_get_public_key(EVP_PKEY *key, CK_BYTE_PTR data, CK_ULONG_PTR len);
CK_RV free_key(EVP_PKEY *key);
CK_RV do_pkcs_t1(CK_BYTE_PTR in, CK_ULONG in_len, CK_BYTE_PTR out, CK_ULONG out_len, CK_ULONG key_len); CK_RV do_pkcs_t1(CK_BYTE_PTR in, CK_ULONG in_len, CK_BYTE_PTR out, CK_ULONG out_len, CK_ULONG key_len);
ykcs11/pkcs11t.h
+383 -376
View File
@@ -158,9 +158,9 @@ typedef struct CK_SLOT_INFO {
/* flags: bit flags that provide capabilities of the slot /* flags: bit flags that provide capabilities of the slot
* Bit Flag Mask Meaning * Bit Flag Mask Meaning
*/ */
#define CKF_TOKEN_PRESENT 0x00000001 /* a token is there */ #define CKF_TOKEN_PRESENT 0x00000001UL /* a token is there */
#define CKF_REMOVABLE_DEVICE 0x00000002 /* removable devices*/ #define CKF_REMOVABLE_DEVICE 0x00000002UL /* removable devices*/
#define CKF_HW_SLOT 0x00000004 /* hardware slot */ #define CKF_HW_SLOT 0x00000004UL /* hardware slot */
typedef CK_SLOT_INFO CK_PTR CK_SLOT_INFO_PTR; typedef CK_SLOT_INFO CK_PTR CK_SLOT_INFO_PTR;
@@ -197,40 +197,40 @@ typedef struct CK_TOKEN_INFO {
/* The flags parameter is defined as follows: /* The flags parameter is defined as follows:
* Bit Flag Mask Meaning * Bit Flag Mask Meaning
*/ */
#define CKF_RNG 0x00000001 /* has random # #define CKF_RNG 0x00000001UL /* has random #
* generator */ * generator */
#define CKF_WRITE_PROTECTED 0x00000002 /* token is #define CKF_WRITE_PROTECTED 0x00000002UL /* token is
* write- * write-
* protected */ * protected */
#define CKF_LOGIN_REQUIRED 0x00000004 /* user must #define CKF_LOGIN_REQUIRED 0x00000004UL /* user must
* login */ * login */
#define CKF_USER_PIN_INITIALIZED 0x00000008 /* normal user's #define CKF_USER_PIN_INITIALIZED 0x00000008UL /* normal user's
* PIN is set */ * PIN is set */
/* CKF_RESTORE_KEY_NOT_NEEDED is new for v2.0. If it is set, /* CKF_RESTORE_KEY_NOT_NEEDED is new for v2.0. If it is set,
* that means that *every* time the state of cryptographic * that means that *every* time the state of cryptographic
* operations of a session is successfully saved, all keys * operations of a session is successfully saved, all keys
* needed to continue those operations are stored in the state */ * needed to continue those operations are stored in the state */
#define CKF_RESTORE_KEY_NOT_NEEDED 0x00000020 #define CKF_RESTORE_KEY_NOT_NEEDED 0x00000020UL
/* CKF_CLOCK_ON_TOKEN is new for v2.0. If it is set, that means /* CKF_CLOCK_ON_TOKEN is new for v2.0. If it is set, that means
* that the token has some sort of clock. The time on that * that the token has some sort of clock. The time on that
* clock is returned in the token info structure */ * clock is returned in the token info structure */
#define CKF_CLOCK_ON_TOKEN 0x00000040 #define CKF_CLOCK_ON_TOKEN 0x00000040UL
/* CKF_PROTECTED_AUTHENTICATION_PATH is new for v2.0. If it is /* CKF_PROTECTED_AUTHENTICATION_PATH is new for v2.0. If it is
* set, that means that there is some way for the user to login * set, that means that there is some way for the user to login
* without sending a PIN through the PKCS #11 library itself */ * without sending a PIN through the PKCS #11 library itself */
#define CKF_PROTECTED_AUTHENTICATION_PATH 0x00000100 #define CKF_PROTECTED_AUTHENTICATION_PATH 0x00000100UL
/* CKF_DUAL_CRYPTO_OPERATIONS is new for v2.0. If it is true, /* CKF_DUAL_CRYPTO_OPERATIONS is new for v2.0. If it is true,
* that means that a single session with the token can perform * that means that a single session with the token can perform
* dual simultaneous cryptographic operations (digest and * dual simultaneous cryptographic operations (digest and
* encrypt; decrypt and digest; sign and encrypt; and decrypt * encrypt; decrypt and digest; sign and encrypt; and decrypt
* and sign) */ * and sign) */
#define CKF_DUAL_CRYPTO_OPERATIONS 0x00000200 #define CKF_DUAL_CRYPTO_OPERATIONS 0x00000200UL
#define CKF_TOKEN_INITIALIZED 0x00000400 #define CKF_TOKEN_INITIALIZED 0x00000400UL
typedef CK_TOKEN_INFO CK_PTR CK_TOKEN_INFO_PTR; typedef CK_TOKEN_INFO CK_PTR CK_TOKEN_INFO_PTR;
@@ -279,8 +279,8 @@ typedef struct CK_SESSION_INFO {
/* The flags are defined in the following table: /* The flags are defined in the following table:
* Bit Flag Mask Meaning * Bit Flag Mask Meaning
*/ */
#define CKF_RW_SESSION 0x00000002 /* session is r/w */ #define CKF_RW_SESSION 0x00000002UL /* session is r/w */
#define CKF_SERIAL_SESSION 0x00000004 /* no parallel */ #define CKF_SERIAL_SESSION 0x00000004UL /* no parallel */
typedef CK_SESSION_INFO CK_PTR CK_SESSION_INFO_PTR; typedef CK_SESSION_INFO CK_PTR CK_SESSION_INFO_PTR;
@@ -300,12 +300,12 @@ typedef CK_OBJECT_HANDLE CK_PTR CK_OBJECT_HANDLE_PTR;
typedef CK_ULONG CK_OBJECT_CLASS; typedef CK_ULONG CK_OBJECT_CLASS;
/* The following classes of objects are defined: */ /* The following classes of objects are defined: */
#define CKO_DATA 0x00000000 #define CKO_DATA 0x00000000UL
#define CKO_CERTIFICATE 0x00000001 #define CKO_CERTIFICATE 0x00000001UL
#define CKO_PUBLIC_KEY 0x00000002 #define CKO_PUBLIC_KEY 0x00000002UL
#define CKO_PRIVATE_KEY 0x00000003 #define CKO_PRIVATE_KEY 0x00000003UL
#define CKO_SECRET_KEY 0x00000004 #define CKO_SECRET_KEY 0x00000004UL
#define CKO_VENDOR_DEFINED 0x80000000 #define CKO_VENDOR_DEFINED 0x80000000UL
typedef CK_OBJECT_CLASS CK_PTR CK_OBJECT_CLASS_PTR; typedef CK_OBJECT_CLASS CK_PTR CK_OBJECT_CLASS_PTR;
@@ -315,40 +315,40 @@ typedef CK_OBJECT_CLASS CK_PTR CK_OBJECT_CLASS_PTR;
typedef CK_ULONG CK_KEY_TYPE; typedef CK_ULONG CK_KEY_TYPE;
/* the following key types are defined: */ /* the following key types are defined: */
#define CKK_RSA 0x00000000 #define CKK_RSA 0x00000000UL
#define CKK_DSA 0x00000001 #define CKK_DSA 0x00000001UL
#define CKK_DH 0x00000002 #define CKK_DH 0x00000002UL
/* CKK_ECDSA and CKK_KEA are new for v2.0 */ /* CKK_ECDSA and CKK_KEA are new for v2.0 */
/* PKCS #11 V2.01 probably won't actually have ECDSA in it */ /* PKCS #11 V2.01 probably won't actually have ECDSA in it */
#define CKK_ECDSA 0x00000003 #define CKK_ECDSA 0x00000003UL
#define CKK_KEA 0x00000005 #define CKK_KEA 0x00000005UL
#define CKK_GENERIC_SECRET 0x00000010 #define CKK_GENERIC_SECRET 0x00000010UL
#define CKK_RC2 0x00000011 #define CKK_RC2 0x00000011UL
#define CKK_RC4 0x00000012 #define CKK_RC4 0x00000012UL
#define CKK_DES 0x00000013 #define CKK_DES 0x00000013UL
#define CKK_DES2 0x00000014 #define CKK_DES2 0x00000014UL
#define CKK_DES3 0x00000015 #define CKK_DES3 0x00000015UL
/* all these key types are new for v2.0 */ /* all these key types are new for v2.0 */
#define CKK_CAST 0x00000016 #define CKK_CAST 0x00000016UL
#define CKK_CAST3 0x00000017 #define CKK_CAST3 0x00000017UL
#define CKK_CAST5 0x00000018 #define CKK_CAST5 0x00000018UL
#define CKK_CAST128 0x00000018 /* CAST128=CAST5 */ #define CKK_CAST128 0x00000018 /* CAST128=CAST5 */
#define CKK_RC5 0x00000019 #define CKK_RC5 0x00000019UL
#define CKK_IDEA 0x0000001A #define CKK_IDEA 0x0000001AUL
#define CKK_SKIPJACK 0x0000001B #define CKK_SKIPJACK 0x0000001BUL
#define CKK_BATON 0x0000001C #define CKK_BATON 0x0000001CUL
#define CKK_JUNIPER 0x0000001D #define CKK_JUNIPER 0x0000001DUL
#define CKK_CDMF 0x0000001E #define CKK_CDMF 0x0000001EUL
/* all these key types are new for v2.11 */ /* all these key types are new for v2.11 */
#define CKK_AES 0x0000001F #define CKK_AES 0x0000001FUL
#define CKK_VENDOR_DEFINED 0x80000000 #define CKK_VENDOR_DEFINED 0x80000000UL
/* CK_CERTIFICATE_TYPE is a value that identifies a certificate /* CK_CERTIFICATE_TYPE is a value that identifies a certificate
@@ -359,8 +359,8 @@ typedef CK_ULONG CK_CERTIFICATE_TYPE;
typedef CK_CERTIFICATE_TYPE CK_PTR CK_CERTIFICATE_TYPE_PTR; typedef CK_CERTIFICATE_TYPE CK_PTR CK_CERTIFICATE_TYPE_PTR;
/* The following certificate types are defined: */ /* The following certificate types are defined: */
#define CKC_X_509 0x00000000 #define CKC_X_509 0x00000000UL
#define CKC_VENDOR_DEFINED 0x80000000 #define CKC_VENDOR_DEFINED 0x80000000UL
/* CK_ATTRIBUTE_TYPE is a value that identifies an attribute /* CK_ATTRIBUTE_TYPE is a value that identifies an attribute
@@ -370,56 +370,63 @@ typedef CK_CERTIFICATE_TYPE CK_PTR CK_CERTIFICATE_TYPE_PTR;
typedef CK_ULONG CK_ATTRIBUTE_TYPE; typedef CK_ULONG CK_ATTRIBUTE_TYPE;
/* The following attribute types are defined: */ /* The following attribute types are defined: */
#define CKA_CLASS 0x00000000 #define CKA_CLASS 0x00000000UL
#define CKA_TOKEN 0x00000001 #define CKA_TOKEN 0x00000001UL
#define CKA_PRIVATE 0x00000002 #define CKA_PRIVATE 0x00000002UL
#define CKA_LABEL 0x00000003 #define CKA_LABEL 0x00000003UL
#define CKA_APPLICATION 0x00000010 #define CKA_APPLICATION 0x00000010UL
#define CKA_VALUE 0x00000011 #define CKA_VALUE 0x00000011UL
#define CKA_OBJECT_ID 0x00000012 #define CKA_OBJECT_ID 0x00000012UL
#define CKA_CERTIFICATE_TYPE 0x00000080 #define CKA_CERTIFICATE_TYPE 0x00000080UL
#define CKA_ISSUER 0x00000081 #define CKA_ISSUER 0x00000081UL
#define CKA_SERIAL_NUMBER 0x00000082 #define CKA_SERIAL_NUMBER 0x00000082UL
#define CKA_KEY_TYPE 0x00000100 #define CKA_KEY_TYPE 0x00000100UL
#define CKA_SUBJECT 0x00000101 #define CKA_SUBJECT 0x00000101UL
#define CKA_ID 0x00000102 #define CKA_ID 0x00000102UL
#define CKA_SENSITIVE 0x00000103 #define CKA_SENSITIVE 0x00000103UL
#define CKA_ENCRYPT 0x00000104 #define CKA_ENCRYPT 0x00000104UL
#define CKA_DECRYPT 0x00000105 #define CKA_DECRYPT 0x00000105UL
#define CKA_WRAP 0x00000106 #define CKA_WRAP 0x00000106UL
#define CKA_UNWRAP 0x00000107 #define CKA_UNWRAP 0x00000107UL
#define CKA_SIGN 0x00000108 #define CKA_SIGN 0x00000108UL
#define CKA_SIGN_RECOVER 0x00000109 #define CKA_SIGN_RECOVER 0x00000109UL
#define CKA_VERIFY 0x0000010A #define CKA_VERIFY 0x0000010AUL
#define CKA_VERIFY_RECOVER 0x0000010B #define CKA_VERIFY_RECOVER 0x0000010BUL
#define CKA_DERIVE 0x0000010C #define CKA_DERIVE 0x0000010CUL
#define CKA_START_DATE 0x00000110 #define CKA_START_DATE 0x00000110UL
#define CKA_END_DATE 0x00000111 #define CKA_END_DATE 0x00000111UL
#define CKA_MODULUS 0x00000120 #define CKA_MODULUS 0x00000120UL
#define CKA_MODULUS_BITS 0x00000121 #define CKA_MODULUS_BITS 0x00000121UL
#define CKA_PUBLIC_EXPONENT 0x00000122 #define CKA_PUBLIC_EXPONENT 0x00000122UL
#define CKA_PRIVATE_EXPONENT 0x00000123 #define CKA_PRIVATE_EXPONENT 0x00000123UL
#define CKA_PRIME_1 0x00000124 #define CKA_PRIME_1 0x00000124UL
#define CKA_PRIME_2 0x00000125 #define CKA_PRIME_2 0x00000125UL
#define CKA_EXPONENT_1 0x00000126 #define CKA_EXPONENT_1 0x00000126UL
#define CKA_EXPONENT_2 0x00000127 #define CKA_EXPONENT_2 0x00000127UL
#define CKA_COEFFICIENT 0x00000128 #define CKA_COEFFICIENT 0x00000128UL
#define CKA_PRIME 0x00000130 #define CKA_PRIME 0x00000130UL
#define CKA_SUBPRIME 0x00000131 #define CKA_SUBPRIME 0x00000131UL
#define CKA_BASE 0x00000132 #define CKA_BASE 0x00000132UL
#define CKA_VALUE_BITS 0x00000160 #define CKA_VALUE_BITS 0x00000160UL
#define CKA_VALUE_LEN 0x00000161 #define CKA_VALUE_LEN 0x00000161UL
/* CKA_EXTRACTABLE, CKA_LOCAL, CKA_NEVER_EXTRACTABLE, /* CKA_EXTRACTABLE, CKA_LOCAL, CKA_NEVER_EXTRACTABLE,
* CKA_ALWAYS_SENSITIVE, and CKA_MODIFIABLE are new for v2.0 */ * CKA_ALWAYS_SENSITIVE, and CKA_MODIFIABLE are new for v2.0 */
#define CKA_EXTRACTABLE 0x00000162 #define CKA_EXTRACTABLE 0x00000162UL
#define CKA_LOCAL 0x00000163 #define CKA_LOCAL 0x00000163UL
#define CKA_NEVER_EXTRACTABLE 0x00000164 #define CKA_NEVER_EXTRACTABLE 0x00000164UL
#define CKA_ALWAYS_SENSITIVE 0x00000165 #define CKA_ALWAYS_SENSITIVE 0x00000165UL
#define CKA_MODIFIABLE 0x00000170 #define CKA_MODIFIABLE 0x00000170UL
#define CKA_VENDOR_DEFINED 0x80000000 /* New in 2.2 */
#define CKA_COPYABLE 0x00000171UL
#define CKA_DESTROYABLE 0x00000172UL
#define CKA_ECDSA_PARAMS 0x00000180UL
#define CKA_EC_PARAMS 0x00000180UL
#define CKA_EC_POINT 0x00000181UL
#define CKA_ALWAYS_AUTHENTICATE 0x00000202UL
#define CKA_VENDOR_DEFINED 0x80000000UL
/* CK_ATTRIBUTE is a structure that includes the type, length /* CK_ATTRIBUTE is a structure that includes the type, length
* and value of an attribute */ * and value of an attribute */
@@ -449,219 +456,219 @@ typedef struct CK_DATE{
typedef CK_ULONG CK_MECHANISM_TYPE; typedef CK_ULONG CK_MECHANISM_TYPE;
/* the following mechanism types are defined: */ /* the following mechanism types are defined: */
#define CKM_RSA_PKCS_KEY_PAIR_GEN 0x00000000 #define CKM_RSA_PKCS_KEY_PAIR_GEN 0x00000000UL
#define CKM_RSA_PKCS 0x00000001 #define CKM_RSA_PKCS 0x00000001UL
#define CKM_RSA_9796 0x00000002 #define CKM_RSA_9796 0x00000002UL
#define CKM_RSA_X_509 0x00000003 #define CKM_RSA_X_509 0x00000003UL
/* CKM_MD2_RSA_PKCS, CKM_MD5_RSA_PKCS, and CKM_SHA1_RSA_PKCS /* CKM_MD2_RSA_PKCS, CKM_MD5_RSA_PKCS, and CKM_SHA1_RSA_PKCS
* are new for v2.0. They are mechanisms which hash and sign */ * are new for v2.0. They are mechanisms which hash and sign */
#define CKM_MD2_RSA_PKCS 0x00000004 #define CKM_MD2_RSA_PKCS 0x00000004UL
#define CKM_MD5_RSA_PKCS 0x00000005 #define CKM_MD5_RSA_PKCS 0x00000005UL
#define CKM_SHA1_RSA_PKCS 0x00000006 #define CKM_SHA1_RSA_PKCS 0x00000006UL
/* Added for 2.4 */ /* Added for 2.4 */
#define CKM_RSA_PKCS_PSS 0x0000000D #define CKM_RSA_PKCS_PSS 0x0000000DUL
#define CKM_SHA1_RSA_PKCS_PSS 0x0000000E #define CKM_SHA1_RSA_PKCS_PSS 0x0000000EUL
/* Added for 2.4 */ /* Added for 2.4 */
#define CKM_DSA_KEY_PAIR_GEN 0x00000010 #define CKM_DSA_KEY_PAIR_GEN 0x00000010UL
#define CKM_DSA 0x00000011 #define CKM_DSA 0x00000011UL
#define CKM_DSA_SHA1 0x00000012 #define CKM_DSA_SHA1 0x00000012UL
#define CKM_DH_PKCS_KEY_PAIR_GEN 0x00000020 #define CKM_DH_PKCS_KEY_PAIR_GEN 0x00000020UL
#define CKM_DH_PKCS_DERIVE 0x00000021 #define CKM_DH_PKCS_DERIVE 0x00000021UL
/* Added for 2.4 */ /* Added for 2.4 */
#define CKM_SHA256_RSA_PKCS 0x00000040 #define CKM_SHA256_RSA_PKCS 0x00000040UL
#define CKM_SHA384_RSA_PKCS 0x00000041 #define CKM_SHA384_RSA_PKCS 0x00000041UL
#define CKM_SHA512_RSA_PKCS 0x00000042 #define CKM_SHA512_RSA_PKCS 0x00000042UL
#define CKM_SHA256_RSA_PKCS_PSS 0x00000043 #define CKM_SHA256_RSA_PKCS_PSS 0x00000043UL
#define CKM_SHA384_RSA_PKCS_PSS 0x00000044 #define CKM_SHA384_RSA_PKCS_PSS 0x00000044UL
#define CKM_SHA512_RSA_PKCS_PSS 0x00000045 #define CKM_SHA512_RSA_PKCS_PSS 0x00000045UL
/* Added for 2.4 */ /* Added for 2.4 */
#define CKM_RC2_KEY_GEN 0x00000100 #define CKM_RC2_KEY_GEN 0x00000100UL
#define CKM_RC2_ECB 0x00000101 #define CKM_RC2_ECB 0x00000101UL
#define CKM_RC2_CBC 0x00000102 #define CKM_RC2_CBC 0x00000102UL
#define CKM_RC2_MAC 0x00000103 #define CKM_RC2_MAC 0x00000103UL
/* CKM_RC2_MAC_GENERAL and CKM_RC2_CBC_PAD are new for v2.0 */ /* CKM_RC2_MAC_GENERAL and CKM_RC2_CBC_PAD are new for v2.0 */
#define CKM_RC2_MAC_GENERAL 0x00000104 #define CKM_RC2_MAC_GENERAL 0x00000104UL
#define CKM_RC2_CBC_PAD 0x00000105 #define CKM_RC2_CBC_PAD 0x00000105UL
#define CKM_RC4_KEY_GEN 0x00000110 #define CKM_RC4_KEY_GEN 0x00000110UL
#define CKM_RC4 0x00000111 #define CKM_RC4 0x00000111UL
#define CKM_DES_KEY_GEN 0x00000120 #define CKM_DES_KEY_GEN 0x00000120UL
#define CKM_DES_ECB 0x00000121 #define CKM_DES_ECB 0x00000121UL
#define CKM_DES_CBC 0x00000122 #define CKM_DES_CBC 0x00000122UL
#define CKM_DES_MAC 0x00000123 #define CKM_DES_MAC 0x00000123UL
/* CKM_DES_MAC_GENERAL and CKM_DES_CBC_PAD are new for v2.0 */ /* CKM_DES_MAC_GENERAL and CKM_DES_CBC_PAD are new for v2.0 */
#define CKM_DES_MAC_GENERAL 0x00000124 #define CKM_DES_MAC_GENERAL 0x00000124UL
#define CKM_DES_CBC_PAD 0x00000125 #define CKM_DES_CBC_PAD 0x00000125UL
#define CKM_DES2_KEY_GEN 0x00000130 #define CKM_DES2_KEY_GEN 0x00000130UL
#define CKM_DES3_KEY_GEN 0x00000131 #define CKM_DES3_KEY_GEN 0x00000131UL
#define CKM_DES3_ECB 0x00000132 #define CKM_DES3_ECB 0x00000132UL
#define CKM_DES3_CBC 0x00000133 #define CKM_DES3_CBC 0x00000133UL
#define CKM_DES3_MAC 0x00000134 #define CKM_DES3_MAC 0x00000134UL
/* CKM_DES3_MAC_GENERAL, CKM_DES3_CBC_PAD, CKM_CDMF_KEY_GEN, /* CKM_DES3_MAC_GENERAL, CKM_DES3_CBC_PAD, CKM_CDMF_KEY_GEN,
* CKM_CDMF_ECB, CKM_CDMF_CBC, CKM_CDMF_MAC, * CKM_CDMF_ECB, CKM_CDMF_CBC, CKM_CDMF_MAC,
* CKM_CDMF_MAC_GENERAL, and CKM_CDMF_CBC_PAD are new for v2.0 */ * CKM_CDMF_MAC_GENERAL, and CKM_CDMF_CBC_PAD are new for v2.0 */
#define CKM_DES3_MAC_GENERAL 0x00000135 #define CKM_DES3_MAC_GENERAL 0x00000135UL
#define CKM_DES3_CBC_PAD 0x00000136 #define CKM_DES3_CBC_PAD 0x00000136UL
#define CKM_CDMF_KEY_GEN 0x00000140 #define CKM_CDMF_KEY_GEN 0x00000140UL
#define CKM_CDMF_ECB 0x00000141 #define CKM_CDMF_ECB 0x00000141UL
#define CKM_CDMF_CBC 0x00000142 #define CKM_CDMF_CBC 0x00000142UL
#define CKM_CDMF_MAC 0x00000143 #define CKM_CDMF_MAC 0x00000143UL
#define CKM_CDMF_MAC_GENERAL 0x00000144 #define CKM_CDMF_MAC_GENERAL 0x00000144UL
#define CKM_CDMF_CBC_PAD 0x00000145 #define CKM_CDMF_CBC_PAD 0x00000145UL
#define CKM_MD2 0x00000200 #define CKM_MD2 0x00000200UL
/* CKM_MD2_HMAC and CKM_MD2_HMAC_GENERAL are new for v2.0 */ /* CKM_MD2_HMAC and CKM_MD2_HMAC_GENERAL are new for v2.0 */
#define CKM_MD2_HMAC 0x00000201 #define CKM_MD2_HMAC 0x00000201UL
#define CKM_MD2_HMAC_GENERAL 0x00000202 #define CKM_MD2_HMAC_GENERAL 0x00000202UL
#define CKM_MD5 0x00000210 #define CKM_MD5 0x00000210UL
/* CKM_MD5_HMAC and CKM_MD5_HMAC_GENERAL are new for v2.0 */ /* CKM_MD5_HMAC and CKM_MD5_HMAC_GENERAL are new for v2.0 */
#define CKM_MD5_HMAC 0x00000211 #define CKM_MD5_HMAC 0x00000211UL
#define CKM_MD5_HMAC_GENERAL 0x00000212 #define CKM_MD5_HMAC_GENERAL 0x00000212UL
#define CKM_SHA_1 0x00000220 #define CKM_SHA_1 0x00000220UL
/* CKM_SHA_1_HMAC and CKM_SHA_1_HMAC_GENERAL are new for v2.0 */ /* CKM_SHA_1_HMAC and CKM_SHA_1_HMAC_GENERAL are new for v2.0 */
#define CKM_SHA_1_HMAC 0x00000221 #define CKM_SHA_1_HMAC 0x00000221UL
#define CKM_SHA_1_HMAC_GENERAL 0x00000222 #define CKM_SHA_1_HMAC_GENERAL 0x00000222UL
/* Added for 2.4 */ /* Added for 2.4 */
#define CKM_SHA256 0x00000250 #define CKM_SHA256 0x00000250UL
#define CKM_SHA384 0x00000260 #define CKM_SHA384 0x00000260UL
#define CKM_SHA512 0x00000270 #define CKM_SHA512 0x00000270UL
/* Added for 2.4 */ /* Added for 2.4 */
/* All of the following mechanisms are new for v2.0 */ /* All of the following mechanisms are new for v2.0 */
/* Note that CAST128 and CAST5 are the same algorithm */ /* Note that CAST128 and CAST5 are the same algorithm */
#define CKM_CAST_KEY_GEN 0x00000300 #define CKM_CAST_KEY_GEN 0x00000300UL
#define CKM_CAST_ECB 0x00000301 #define CKM_CAST_ECB 0x00000301UL
#define CKM_CAST_CBC 0x00000302 #define CKM_CAST_CBC 0x00000302UL
#define CKM_CAST_MAC 0x00000303 #define CKM_CAST_MAC 0x00000303UL
#define CKM_CAST_MAC_GENERAL 0x00000304 #define CKM_CAST_MAC_GENERAL 0x00000304UL
#define CKM_CAST_CBC_PAD 0x00000305 #define CKM_CAST_CBC_PAD 0x00000305UL
#define CKM_CAST3_KEY_GEN 0x00000310 #define CKM_CAST3_KEY_GEN 0x00000310UL
#define CKM_CAST3_ECB 0x00000311 #define CKM_CAST3_ECB 0x00000311UL
#define CKM_CAST3_CBC 0x00000312 #define CKM_CAST3_CBC 0x00000312UL
#define CKM_CAST3_MAC 0x00000313 #define CKM_CAST3_MAC 0x00000313UL
#define CKM_CAST3_MAC_GENERAL 0x00000314 #define CKM_CAST3_MAC_GENERAL 0x00000314UL
#define CKM_CAST3_CBC_PAD 0x00000315 #define CKM_CAST3_CBC_PAD 0x00000315UL
#define CKM_CAST5_KEY_GEN 0x00000320 #define CKM_CAST5_KEY_GEN 0x00000320UL
#define CKM_CAST128_KEY_GEN 0x00000320 #define CKM_CAST128_KEY_GEN 0x00000320UL
#define CKM_CAST5_ECB 0x00000321 #define CKM_CAST5_ECB 0x00000321UL
#define CKM_CAST128_ECB 0x00000321 #define CKM_CAST128_ECB 0x00000321UL
#define CKM_CAST5_CBC 0x00000322 #define CKM_CAST5_CBC 0x00000322UL
#define CKM_CAST128_CBC 0x00000322 #define CKM_CAST128_CBC 0x00000322UL
#define CKM_CAST5_MAC 0x00000323 #define CKM_CAST5_MAC 0x00000323UL
#define CKM_CAST128_MAC 0x00000323 #define CKM_CAST128_MAC 0x00000323UL
#define CKM_CAST5_MAC_GENERAL 0x00000324 #define CKM_CAST5_MAC_GENERAL 0x00000324UL
#define CKM_CAST128_MAC_GENERAL 0x00000324 #define CKM_CAST128_MAC_GENERAL 0x00000324UL
#define CKM_CAST5_CBC_PAD 0x00000325 #define CKM_CAST5_CBC_PAD 0x00000325UL
#define CKM_CAST128_CBC_PAD 0x00000325 #define CKM_CAST128_CBC_PAD 0x00000325UL
#define CKM_RC5_KEY_GEN 0x00000330 #define CKM_RC5_KEY_GEN 0x00000330UL
#define CKM_RC5_ECB 0x00000331 #define CKM_RC5_ECB 0x00000331UL
#define CKM_RC5_CBC 0x00000332 #define CKM_RC5_CBC 0x00000332UL
#define CKM_RC5_MAC 0x00000333 #define CKM_RC5_MAC 0x00000333UL
#define CKM_RC5_MAC_GENERAL 0x00000334 #define CKM_RC5_MAC_GENERAL 0x00000334UL
#define CKM_RC5_CBC_PAD 0x00000335 #define CKM_RC5_CBC_PAD 0x00000335UL
#define CKM_IDEA_KEY_GEN 0x00000340 #define CKM_IDEA_KEY_GEN 0x00000340UL
#define CKM_IDEA_ECB 0x00000341 #define CKM_IDEA_ECB 0x00000341UL
#define CKM_IDEA_CBC 0x00000342 #define CKM_IDEA_CBC 0x00000342UL
#define CKM_IDEA_MAC 0x00000343 #define CKM_IDEA_MAC 0x00000343UL
#define CKM_IDEA_MAC_GENERAL 0x00000344 #define CKM_IDEA_MAC_GENERAL 0x00000344UL
#define CKM_IDEA_CBC_PAD 0x00000345 #define CKM_IDEA_CBC_PAD 0x00000345UL
#define CKM_GENERIC_SECRET_KEY_GEN 0x00000350 #define CKM_GENERIC_SECRET_KEY_GEN 0x00000350UL
#define CKM_CONCATENATE_BASE_AND_KEY 0x00000360 #define CKM_CONCATENATE_BASE_AND_KEY 0x00000360UL
#define CKM_CONCATENATE_BASE_AND_DATA 0x00000362 #define CKM_CONCATENATE_BASE_AND_DATA 0x00000362UL
#define CKM_CONCATENATE_DATA_AND_BASE 0x00000363 #define CKM_CONCATENATE_DATA_AND_BASE 0x00000363UL
#define CKM_XOR_BASE_AND_DATA 0x00000364 #define CKM_XOR_BASE_AND_DATA 0x00000364UL
#define CKM_EXTRACT_KEY_FROM_KEY 0x00000365 #define CKM_EXTRACT_KEY_FROM_KEY 0x00000365UL
#define CKM_SSL3_PRE_MASTER_KEY_GEN 0x00000370 #define CKM_SSL3_PRE_MASTER_KEY_GEN 0x00000370UL
#define CKM_SSL3_MASTER_KEY_DERIVE 0x00000371 #define CKM_SSL3_MASTER_KEY_DERIVE 0x00000371UL
#define CKM_SSL3_KEY_AND_MAC_DERIVE 0x00000372 #define CKM_SSL3_KEY_AND_MAC_DERIVE 0x00000372UL
#define CKM_SSL3_MD5_MAC 0x00000380 #define CKM_SSL3_MD5_MAC 0x00000380UL
#define CKM_SSL3_SHA1_MAC 0x00000381 #define CKM_SSL3_SHA1_MAC 0x00000381UL
#define CKM_MD5_KEY_DERIVATION 0x00000390 #define CKM_MD5_KEY_DERIVATION 0x00000390UL
#define CKM_MD2_KEY_DERIVATION 0x00000391 #define CKM_MD2_KEY_DERIVATION 0x00000391UL
#define CKM_SHA1_KEY_DERIVATION 0x00000392 #define CKM_SHA1_KEY_DERIVATION 0x00000392UL
#define CKM_PBE_MD2_DES_CBC 0x000003A0 #define CKM_PBE_MD2_DES_CBC 0x000003A0UL
#define CKM_PBE_MD5_DES_CBC 0x000003A1 #define CKM_PBE_MD5_DES_CBC 0x000003A1UL
#define CKM_PBE_MD5_CAST_CBC 0x000003A2 #define CKM_PBE_MD5_CAST_CBC 0x000003A2UL
#define CKM_PBE_MD5_CAST3_CBC 0x000003A3 #define CKM_PBE_MD5_CAST3_CBC 0x000003A3UL
#define CKM_PBE_MD5_CAST5_CBC 0x000003A4 #define CKM_PBE_MD5_CAST5_CBC 0x000003A4UL
#define CKM_PBE_MD5_CAST128_CBC 0x000003A4 #define CKM_PBE_MD5_CAST128_CBC 0x000003A4UL
#define CKM_PBE_SHA1_CAST5_CBC 0x000003A5 #define CKM_PBE_SHA1_CAST5_CBC 0x000003A5UL
#define CKM_PBE_SHA1_CAST128_CBC 0x000003A5 #define CKM_PBE_SHA1_CAST128_CBC 0x000003A5UL
#define CKM_PBE_SHA1_RC4_128 0x000003A6 #define CKM_PBE_SHA1_RC4_128 0x000003A6UL
#define CKM_PBE_SHA1_RC4_40 0x000003A7 #define CKM_PBE_SHA1_RC4_40 0x000003A7UL
#define CKM_PBE_SHA1_DES3_EDE_CBC 0x000003A8 #define CKM_PBE_SHA1_DES3_EDE_CBC 0x000003A8UL
#define CKM_PBE_SHA1_DES2_EDE_CBC 0x000003A9 #define CKM_PBE_SHA1_DES2_EDE_CBC 0x000003A9UL
#define CKM_PBE_SHA1_RC2_128_CBC 0x000003AA #define CKM_PBE_SHA1_RC2_128_CBC 0x000003AAUL
#define CKM_PBE_SHA1_RC2_40_CBC 0x000003AB #define CKM_PBE_SHA1_RC2_40_CBC 0x000003ABUL
#define CKM_PBA_SHA1_WITH_SHA1_HMAC 0x000003C0 #define CKM_PBA_SHA1_WITH_SHA1_HMAC 0x000003C0UL
#define CKM_KEY_WRAP_LYNKS 0x00000400 #define CKM_KEY_WRAP_LYNKS 0x00000400UL
#define CKM_KEY_WRAP_SET_OAEP 0x00000401 #define CKM_KEY_WRAP_SET_OAEP 0x00000401UL
/* Fortezza mechanisms */ /* Fortezza mechanisms */
#define CKM_SKIPJACK_KEY_GEN 0x00001000 #define CKM_SKIPJACK_KEY_GEN 0x00001000UL
#define CKM_SKIPJACK_ECB64 0x00001001 #define CKM_SKIPJACK_ECB64 0x00001001UL
#define CKM_SKIPJACK_CBC64 0x00001002 #define CKM_SKIPJACK_CBC64 0x00001002UL
#define CKM_SKIPJACK_OFB64 0x00001003 #define CKM_SKIPJACK_OFB64 0x00001003UL
#define CKM_SKIPJACK_CFB64 0x00001004 #define CKM_SKIPJACK_CFB64 0x00001004UL
#define CKM_SKIPJACK_CFB32 0x00001005 #define CKM_SKIPJACK_CFB32 0x00001005UL
#define CKM_SKIPJACK_CFB16 0x00001006 #define CKM_SKIPJACK_CFB16 0x00001006UL
#define CKM_SKIPJACK_CFB8 0x00001007 #define CKM_SKIPJACK_CFB8 0x00001007UL
#define CKM_SKIPJACK_WRAP 0x00001008 #define CKM_SKIPJACK_WRAP 0x00001008UL
#define CKM_SKIPJACK_PRIVATE_WRAP 0x00001009 #define CKM_SKIPJACK_PRIVATE_WRAP 0x00001009UL
#define CKM_SKIPJACK_RELAYX 0x0000100a #define CKM_SKIPJACK_RELAYX 0x0000100aUL
#define CKM_KEA_KEY_PAIR_GEN 0x00001010 #define CKM_KEA_KEY_PAIR_GEN 0x00001010UL
#define CKM_KEA_KEY_DERIVE 0x00001011 #define CKM_KEA_KEY_DERIVE 0x00001011UL
#define CKM_FORTEZZA_TIMESTAMP 0x00001020 #define CKM_FORTEZZA_TIMESTAMP 0x00001020UL
#define CKM_BATON_KEY_GEN 0x00001030 #define CKM_BATON_KEY_GEN 0x00001030UL
#define CKM_BATON_ECB128 0x00001031 #define CKM_BATON_ECB128 0x00001031UL
#define CKM_BATON_ECB96 0x00001032 #define CKM_BATON_ECB96 0x00001032UL
#define CKM_BATON_CBC128 0x00001033 #define CKM_BATON_CBC128 0x00001033UL
#define CKM_BATON_COUNTER 0x00001034 #define CKM_BATON_COUNTER 0x00001034UL
#define CKM_BATON_SHUFFLE 0x00001035 #define CKM_BATON_SHUFFLE 0x00001035UL
#define CKM_BATON_WRAP 0x00001036 #define CKM_BATON_WRAP 0x00001036UL
/* PKCS #11 V2.01 probably won't actually have ECDSA in it */ /* PKCS #11 V2.01 probably won't actually have ECDSA in it */
#define CKM_EC_KEY_PAIR_GEN 0x00001040 #define CKM_EC_KEY_PAIR_GEN 0x00001040UL
//#define CKM_ECDSA_KEY_PAIR_GEN 0x00001040 // Deprecated in 2.11 //#define CKM_ECDSA_KEY_PAIR_GEN 0x00001040 // Deprecated in 2.11
#define CKM_ECDSA 0x00001041 #define CKM_ECDSA 0x00001041UL
#define CKM_ECDSA_SHA1 0x00001042 #define CKM_ECDSA_SHA1 0x00001042UL
/* Added for 2.4 */ /* Added for 2.4 */
#define CKM_ECDH1_DERIVE 0x00001050 #define CKM_ECDH1_DERIVE 0x00001050UL
#define CKM_ECDH1_COFACTOR_DERIVE 0x00001051 #define CKM_ECDH1_COFACTOR_DERIVE 0x00001051UL
/* Added for 2.4 */ /* Added for 2.4 */
#define CKM_JUNIPER_KEY_GEN 0x00001060 #define CKM_JUNIPER_KEY_GEN 0x00001060UL
#define CKM_JUNIPER_ECB128 0x00001061 #define CKM_JUNIPER_ECB128 0x00001061UL
#define CKM_JUNIPER_CBC128 0x00001062 #define CKM_JUNIPER_CBC128 0x00001062UL
#define CKM_JUNIPER_COUNTER 0x00001063 #define CKM_JUNIPER_COUNTER 0x00001063UL
#define CKM_JUNIPER_SHUFFLE 0x00001064 #define CKM_JUNIPER_SHUFFLE 0x00001064UL
#define CKM_JUNIPER_WRAP 0x00001065 #define CKM_JUNIPER_WRAP 0x00001065UL
#define CKM_FASTHASH 0x00001070 #define CKM_FASTHASH 0x00001070UL
#define CKM_AES_KEY_GEN 0x00001080 #define CKM_AES_KEY_GEN 0x00001080UL
#define CKM_AES_ECB 0x00001081 #define CKM_AES_ECB 0x00001081UL
#define CKM_AES_CBC 0x00001082 #define CKM_AES_CBC 0x00001082UL
#define CKM_AES_MAC 0x00001083 #define CKM_AES_MAC 0x00001083UL
#define CKM_AES_MAC_GENERAL 0x00001084 #define CKM_AES_MAC_GENERAL 0x00001084UL
#define CKM_AES_CBC_PAD 0x00001085 #define CKM_AES_CBC_PAD 0x00001085UL
#define CKM_VENDOR_DEFINED 0x80000000 #define CKM_VENDOR_DEFINED 0x80000000UL
typedef CK_MECHANISM_TYPE CK_PTR CK_MECHANISM_TYPE_PTR; typedef CK_MECHANISM_TYPE CK_PTR CK_MECHANISM_TYPE_PTR;
@@ -690,27 +697,27 @@ typedef struct CK_MECHANISM_INFO {
/* The flags are defined as follows: /* The flags are defined as follows:
* Bit Flag Mask Meaning */ * Bit Flag Mask Meaning */
#define CKF_HW 0x00000001 /* performed by HW */ #define CKF_HW 0x00000001UL /* performed by HW */
/* The flags CKF_ENCRYPT, CKF_DECRYPT, CKF_DIGEST, CKF_SIGN, /* The flags CKF_ENCRYPT, CKF_DECRYPT, CKF_DIGEST, CKF_SIGN,
* CKG_SIGN_RECOVER, CKF_VERIFY, CKF_VERIFY_RECOVER, * CKG_SIGN_RECOVER, CKF_VERIFY, CKF_VERIFY_RECOVER,
* CKF_GENERATE, CKF_GENERATE_KEY_PAIR, CKF_WRAP, CKF_UNWRAP, * CKF_GENERATE, CKF_GENERATE_KEY_PAIR, CKF_WRAP, CKF_UNWRAP,
* and CKF_DERIVE are new for v2.0. They specify whether or not * and CKF_DERIVE are new for v2.0. They specify whether or not
* a mechanism can be used for a particular task */ * a mechanism can be used for a particular task */
#define CKF_ENCRYPT 0x00000100 #define CKF_ENCRYPT 0x00000100UL
#define CKF_DECRYPT 0x00000200 #define CKF_DECRYPT 0x00000200UL
#define CKF_DIGEST 0x00000400 #define CKF_DIGEST 0x00000400UL
#define CKF_SIGN 0x00000800 #define CKF_SIGN 0x00000800UL
#define CKF_SIGN_RECOVER 0x00001000 #define CKF_SIGN_RECOVER 0x00001000UL
#define CKF_VERIFY 0x00002000 #define CKF_VERIFY 0x00002000UL
#define CKF_VERIFY_RECOVER 0x00004000 #define CKF_VERIFY_RECOVER 0x00004000UL
#define CKF_GENERATE 0x00008000 #define CKF_GENERATE 0x00008000UL
#define CKF_GENERATE_KEY_PAIR 0x00010000 #define CKF_GENERATE_KEY_PAIR 0x00010000UL
#define CKF_WRAP 0x00020000 #define CKF_WRAP 0x00020000UL
#define CKF_UNWRAP 0x00040000 #define CKF_UNWRAP 0x00040000UL
#define CKF_DERIVE 0x00080000 #define CKF_DERIVE 0x00080000UL
#define CKF_EXTENSION 0x80000000 /* FALSE for 2.01 */ #define CKF_EXTENSION 0x80000000UL /* FALSE for 2.01 */
typedef CK_MECHANISM_INFO CK_PTR CK_MECHANISM_INFO_PTR; typedef CK_MECHANISM_INFO CK_PTR CK_MECHANISM_INFO_PTR;
@@ -720,129 +727,129 @@ typedef CK_MECHANISM_INFO CK_PTR CK_MECHANISM_INFO_PTR;
/* CK_RV was changed from CK_USHORT to CK_ULONG for v2.0 */ /* CK_RV was changed from CK_USHORT to CK_ULONG for v2.0 */
typedef CK_ULONG CK_RV; typedef CK_ULONG CK_RV;
#define CKR_OK 0x00000000 #define CKR_OK 0x00000000UL
#define CKR_CANCEL 0x00000001 #define CKR_CANCEL 0x00000001UL
#define CKR_HOST_MEMORY 0x00000002 #define CKR_HOST_MEMORY 0x00000002UL
#define CKR_SLOT_ID_INVALID 0x00000003 #define CKR_SLOT_ID_INVALID 0x00000003UL
/* CKR_FLAGS_INVALID was removed for v2.0 */ /* CKR_FLAGS_INVALID was removed for v2.0 */
/* CKR_GENERAL_ERROR and CKR_FUNCTION_FAILED are new for v2.0 */ /* CKR_GENERAL_ERROR and CKR_FUNCTION_FAILED are new for v2.0 */
#define CKR_GENERAL_ERROR 0x00000005 #define CKR_GENERAL_ERROR 0x00000005UL
#define CKR_FUNCTION_FAILED 0x00000006 #define CKR_FUNCTION_FAILED 0x00000006UL
/* CKR_ARGUMENTS_BAD, CKR_NO_EVENT, CKR_NEED_TO_CREATE_THREADS, /* CKR_ARGUMENTS_BAD, CKR_NO_EVENT, CKR_NEED_TO_CREATE_THREADS,
* and CKR_CANT_LOCK are new for v2.01 */ * and CKR_CANT_LOCK are new for v2.01 */
#define CKR_ARGUMENTS_BAD 0x00000007 #define CKR_ARGUMENTS_BAD 0x00000007UL
#define CKR_NO_EVENT 0x00000008 #define CKR_NO_EVENT 0x00000008UL
#define CKR_NEED_TO_CREATE_THREADS 0x00000009 #define CKR_NEED_TO_CREATE_THREADS 0x00000009UL
#define CKR_CANT_LOCK 0x0000000A #define CKR_CANT_LOCK 0x0000000AUL
#define CKR_ATTRIBUTE_READ_ONLY 0x00000010 #define CKR_ATTRIBUTE_READ_ONLY 0x00000010UL
#define CKR_ATTRIBUTE_SENSITIVE 0x00000011 #define CKR_ATTRIBUTE_SENSITIVE 0x00000011UL
#define CKR_ATTRIBUTE_TYPE_INVALID 0x00000012 #define CKR_ATTRIBUTE_TYPE_INVALID 0x00000012UL
#define CKR_ATTRIBUTE_VALUE_INVALID 0x00000013 #define CKR_ATTRIBUTE_VALUE_INVALID 0x00000013UL
#define CKR_DATA_INVALID 0x00000020 #define CKR_DATA_INVALID 0x00000020UL
#define CKR_DATA_LEN_RANGE 0x00000021 #define CKR_DATA_LEN_RANGE 0x00000021UL
#define CKR_DEVICE_ERROR 0x00000030 #define CKR_DEVICE_ERROR 0x00000030UL
#define CKR_DEVICE_MEMORY 0x00000031 #define CKR_DEVICE_MEMORY 0x00000031UL
#define CKR_DEVICE_REMOVED 0x00000032 #define CKR_DEVICE_REMOVED 0x00000032UL
#define CKR_ENCRYPTED_DATA_INVALID 0x00000040 #define CKR_ENCRYPTED_DATA_INVALID 0x00000040UL
#define CKR_ENCRYPTED_DATA_LEN_RANGE 0x00000041 #define CKR_ENCRYPTED_DATA_LEN_RANGE 0x00000041UL
#define CKR_FUNCTION_CANCELED 0x00000050 #define CKR_FUNCTION_CANCELED 0x00000050UL
#define CKR_FUNCTION_NOT_PARALLEL 0x00000051 #define CKR_FUNCTION_NOT_PARALLEL 0x00000051UL
/* CKR_FUNCTION_NOT_SUPPORTED is new for v2.0 */ /* CKR_FUNCTION_NOT_SUPPORTED is new for v2.0 */
#define CKR_FUNCTION_NOT_SUPPORTED 0x00000054 #define CKR_FUNCTION_NOT_SUPPORTED 0x00000054UL
#define CKR_KEY_HANDLE_INVALID 0x00000060 #define CKR_KEY_HANDLE_INVALID 0x00000060UL
/* CKR_KEY_SENSITIVE was removed for v2.0 */ /* CKR_KEY_SENSITIVE was removed for v2.0 */
#define CKR_KEY_SIZE_RANGE 0x00000062 #define CKR_KEY_SIZE_RANGE 0x00000062UL
#define CKR_KEY_TYPE_INCONSISTENT 0x00000063 #define CKR_KEY_TYPE_INCONSISTENT 0x00000063UL
/* CKR_KEY_NOT_NEEDED, CKR_KEY_CHANGED, CKR_KEY_NEEDED, /* CKR_KEY_NOT_NEEDED, CKR_KEY_CHANGED, CKR_KEY_NEEDED,
* CKR_KEY_INDIGESTIBLE, CKR_KEY_FUNCTION_NOT_PERMITTED, * CKR_KEY_INDIGESTIBLE, CKR_KEY_FUNCTION_NOT_PERMITTED,
* CKR_KEY_NOT_WRAPPABLE, and CKR_KEY_UNEXTRACTABLE are new for * CKR_KEY_NOT_WRAPPABLE, and CKR_KEY_UNEXTRACTABLE are new for
* v2.0 */ * v2.0 */
#define CKR_KEY_NOT_NEEDED 0x00000064 #define CKR_KEY_NOT_NEEDED 0x00000064UL
#define CKR_KEY_CHANGED 0x00000065 #define CKR_KEY_CHANGED 0x00000065UL
#define CKR_KEY_NEEDED 0x00000066 #define CKR_KEY_NEEDED 0x00000066UL
#define CKR_KEY_INDIGESTIBLE 0x00000067 #define CKR_KEY_INDIGESTIBLE 0x00000067UL
#define CKR_KEY_FUNCTION_NOT_PERMITTED 0x00000068 #define CKR_KEY_FUNCTION_NOT_PERMITTED 0x00000068UL
#define CKR_KEY_NOT_WRAPPABLE 0x00000069 #define CKR_KEY_NOT_WRAPPABLE 0x00000069UL
#define CKR_KEY_UNEXTRACTABLE 0x0000006A #define CKR_KEY_UNEXTRACTABLE 0x0000006AUL
#define CKR_MECHANISM_INVALID 0x00000070 #define CKR_MECHANISM_INVALID 0x00000070UL
#define CKR_MECHANISM_PARAM_INVALID 0x00000071 #define CKR_MECHANISM_PARAM_INVALID 0x00000071UL
/* CKR_OBJECT_CLASS_INCONSISTENT and CKR_OBJECT_CLASS_INVALID /* CKR_OBJECT_CLASS_INCONSISTENT and CKR_OBJECT_CLASS_INVALID
* were removed for v2.0 */ * were removed for v2.0 */
#define CKR_OBJECT_HANDLE_INVALID 0x00000082 #define CKR_OBJECT_HANDLE_INVALID 0x00000082UL
#define CKR_OPERATION_ACTIVE 0x00000090 #define CKR_OPERATION_ACTIVE 0x00000090UL
#define CKR_OPERATION_NOT_INITIALIZED 0x00000091 #define CKR_OPERATION_NOT_INITIALIZED 0x00000091UL
#define CKR_PIN_INCORRECT 0x000000A0 #define CKR_PIN_INCORRECT 0x000000A0UL
#define CKR_PIN_INVALID 0x000000A1 #define CKR_PIN_INVALID 0x000000A1UL
#define CKR_PIN_LEN_RANGE 0x000000A2 #define CKR_PIN_LEN_RANGE 0x000000A2UL
/* CKR_PIN_EXPIRED and CKR_PIN_LOCKED are new for v2.0 */ /* CKR_PIN_EXPIRED and CKR_PIN_LOCKED are new for v2.0 */
#define CKR_PIN_EXPIRED 0x000000A3 #define CKR_PIN_EXPIRED 0x000000A3UL
#define CKR_PIN_LOCKED 0x000000A4 #define CKR_PIN_LOCKED 0x000000A4UL
#define CKR_SESSION_CLOSED 0x000000B0 #define CKR_SESSION_CLOSED 0x000000B0UL
#define CKR_SESSION_COUNT 0x000000B1 #define CKR_SESSION_COUNT 0x000000B1UL
#define CKR_SESSION_HANDLE_INVALID 0x000000B3 #define CKR_SESSION_HANDLE_INVALID 0x000000B3UL
#define CKR_SESSION_PARALLEL_NOT_SUPPORTED 0x000000B4 #define CKR_SESSION_PARALLEL_NOT_SUPPORTED 0x000000B4UL
#define CKR_SESSION_READ_ONLY 0x000000B5 #define CKR_SESSION_READ_ONLY 0x000000B5UL
#define CKR_SESSION_EXISTS 0x000000B6 #define CKR_SESSION_EXISTS 0x000000B6UL
/* CKR_SESSION_READ_ONLY_EXISTS and /* CKR_SESSION_READ_ONLY_EXISTS and
* CKR_SESSION_READ_WRITE_SO_EXISTS are new for v2.0 */ * CKR_SESSION_READ_WRITE_SO_EXISTS are new for v2.0 */
#define CKR_SESSION_READ_ONLY_EXISTS 0x000000B7 #define CKR_SESSION_READ_ONLY_EXISTS 0x000000B7UL
#define CKR_SESSION_READ_WRITE_SO_EXISTS 0x000000B8 #define CKR_SESSION_READ_WRITE_SO_EXISTS 0x000000B8UL
#define CKR_SIGNATURE_INVALID 0x000000C0 #define CKR_SIGNATURE_INVALID 0x000000C0UL
#define CKR_SIGNATURE_LEN_RANGE 0x000000C1 #define CKR_SIGNATURE_LEN_RANGE 0x000000C1UL
#define CKR_TEMPLATE_INCOMPLETE 0x000000D0 #define CKR_TEMPLATE_INCOMPLETE 0x000000D0UL
#define CKR_TEMPLATE_INCONSISTENT 0x000000D1 #define CKR_TEMPLATE_INCONSISTENT 0x000000D1UL
#define CKR_TOKEN_NOT_PRESENT 0x000000E0 #define CKR_TOKEN_NOT_PRESENT 0x000000E0UL
#define CKR_TOKEN_NOT_RECOGNIZED 0x000000E1 #define CKR_TOKEN_NOT_RECOGNIZED 0x000000E1UL
#define CKR_TOKEN_WRITE_PROTECTED 0x000000E2 #define CKR_TOKEN_WRITE_PROTECTED 0x000000E2UL
#define CKR_UNWRAPPING_KEY_HANDLE_INVALID 0x000000F0 #define CKR_UNWRAPPING_KEY_HANDLE_INVALID 0x000000F0UL
#define CKR_UNWRAPPING_KEY_SIZE_RANGE 0x000000F1 #define CKR_UNWRAPPING_KEY_SIZE_RANGE 0x000000F1UL
#define CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT 0x000000F2 #define CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT 0x000000F2UL
#define CKR_USER_ALREADY_LOGGED_IN 0x00000100 #define CKR_USER_ALREADY_LOGGED_IN 0x00000100UL
#define CKR_USER_NOT_LOGGED_IN 0x00000101 #define CKR_USER_NOT_LOGGED_IN 0x00000101UL
#define CKR_USER_PIN_NOT_INITIALIZED 0x00000102 #define CKR_USER_PIN_NOT_INITIALIZED 0x00000102UL
#define CKR_USER_TYPE_INVALID 0x00000103 #define CKR_USER_TYPE_INVALID 0x00000103UL
/* CKR_USER_ANOTHER_ALREADY_LOGGED_IN and CKR_USER_TOO_MANY_TYPES /* CKR_USER_ANOTHER_ALREADY_LOGGED_IN and CKR_USER_TOO_MANY_TYPES
* are new to v2.01 */ * are new to v2.01 */
#define CKR_USER_ANOTHER_ALREADY_LOGGED_IN 0x00000104 #define CKR_USER_ANOTHER_ALREADY_LOGGED_IN 0x00000104UL
#define CKR_USER_TOO_MANY_TYPES 0x00000105 #define CKR_USER_TOO_MANY_TYPES 0x00000105UL
#define CKR_WRAPPED_KEY_INVALID 0x00000110 #define CKR_WRAPPED_KEY_INVALID 0x00000110UL
#define CKR_WRAPPED_KEY_LEN_RANGE 0x00000112 #define CKR_WRAPPED_KEY_LEN_RANGE 0x00000112UL
#define CKR_WRAPPING_KEY_HANDLE_INVALID 0x00000113 #define CKR_WRAPPING_KEY_HANDLE_INVALID 0x00000113UL
#define CKR_WRAPPING_KEY_SIZE_RANGE 0x00000114 #define CKR_WRAPPING_KEY_SIZE_RANGE 0x00000114UL
#define CKR_WRAPPING_KEY_TYPE_INCONSISTENT 0x00000115 #define CKR_WRAPPING_KEY_TYPE_INCONSISTENT 0x00000115UL
#define CKR_RANDOM_SEED_NOT_SUPPORTED 0x00000120 #define CKR_RANDOM_SEED_NOT_SUPPORTED 0x00000120UL
/* These are new to v2.0 */ /* These are new to v2.0 */
#define CKR_RANDOM_NO_RNG 0x00000121 #define CKR_RANDOM_NO_RNG 0x00000121UL
#define CKR_BUFFER_TOO_SMALL 0x00000150 #define CKR_BUFFER_TOO_SMALL 0x00000150UL
#define CKR_SAVED_STATE_INVALID 0x00000160 #define CKR_SAVED_STATE_INVALID 0x00000160UL
#define CKR_INFORMATION_SENSITIVE 0x00000170 #define CKR_INFORMATION_SENSITIVE 0x00000170UL
#define CKR_STATE_UNSAVEABLE 0x00000180 #define CKR_STATE_UNSAVEABLE 0x00000180UL
/* These are new to v2.01 */ /* These are new to v2.01 */
#define CKR_CRYPTOKI_NOT_INITIALIZED 0x00000190 #define CKR_CRYPTOKI_NOT_INITIALIZED 0x00000190UL
#define CKR_CRYPTOKI_ALREADY_INITIALIZED 0x00000191 #define CKR_CRYPTOKI_ALREADY_INITIALIZED 0x00000191UL
#define CKR_MUTEX_BAD 0x000001A0 #define CKR_MUTEX_BAD 0x000001A0UL
#define CKR_MUTEX_NOT_LOCKED 0x000001A1 #define CKR_MUTEX_NOT_LOCKED 0x000001A1UL
#define CKR_VENDOR_DEFINED 0x80000000 #define CKR_VENDOR_DEFINED 0x80000000UL
/* CK_NOTIFY is an application callback that processes events */ /* CK_NOTIFY is an application callback that processes events */
@@ -905,8 +912,8 @@ typedef struct CK_C_INITIALIZE_ARGS {
/* flags: bit flags that provide capabilities of the slot /* flags: bit flags that provide capabilities of the slot
* Bit Flag Mask Meaning * Bit Flag Mask Meaning
*/ */
#define CKF_LIBRARY_CANT_CREATE_OS_THREADS 0x00000001 #define CKF_LIBRARY_CANT_CREATE_OS_THREADS 0x00000001UL
#define CKF_OS_LOCKING_OK 0x00000002 #define CKF_OS_LOCKING_OK 0x00000002UL
typedef CK_C_INITIALIZE_ARGS CK_PTR CK_C_INITIALIZE_ARGS_PTR; typedef CK_C_INITIALIZE_ARGS CK_PTR CK_C_INITIALIZE_ARGS_PTR;
@@ -1144,24 +1151,24 @@ typedef CK_EXTRACT_PARAMS CK_PTR CK_EXTRACT_PARAMS_PTR;
* PKCS #11 interface. Most of these are place holders for other mechanism * PKCS #11 interface. Most of these are place holders for other mechanism
* and will change in the future. * and will change in the future.
*/ */
#define CKM_NETSCAPE_PBE_KEY_GEN 0x80000001L #define CKM_NETSCAPE_PBE_KEY_GEN 0x80000001UL
#define CKM_NETSCAPE_PBE_SHA1_DES_CBC 0x80000002L #define CKM_NETSCAPE_PBE_SHA1_DES_CBC 0x80000002UL
#define CKM_NETSCAPE_PBE_SHA1_TRIPLE_DES_CBC 0x80000003L #define CKM_NETSCAPE_PBE_SHA1_TRIPLE_DES_CBC 0x80000003UL
#define CKM_NETSCAPE_PBE_SHA1_40_BIT_RC2_CBC 0x80000004L #define CKM_NETSCAPE_PBE_SHA1_40_BIT_RC2_CBC 0x80000004UL
#define CKM_NETSCAPE_PBE_SHA1_128_BIT_RC2_CBC 0x80000005L #define CKM_NETSCAPE_PBE_SHA1_128_BIT_RC2_CBC 0x80000005UL
#define CKM_NETSCAPE_PBE_SHA1_40_BIT_RC4 0x80000006L #define CKM_NETSCAPE_PBE_SHA1_40_BIT_RC4 0x80000006UL
#define CKM_NETSCAPE_PBE_SHA1_128_BIT_RC4 0x80000007L #define CKM_NETSCAPE_PBE_SHA1_128_BIT_RC4 0x80000007UL
#define CKM_NETSCAPE_PBE_SHA1_FAULTY_3DES_CBC 0x80000008L #define CKM_NETSCAPE_PBE_SHA1_FAULTY_3DES_CBC 0x80000008UL
#define CKM_NETSCAPE_PBE_SHA1_HMAC_KEY_GEN 0x80000009L #define CKM_NETSCAPE_PBE_SHA1_HMAC_KEY_GEN 0x80000009UL
#define CKM_NETSCAPE_PBE_MD5_HMAC_KEY_GEN 0x8000000aL #define CKM_NETSCAPE_PBE_MD5_HMAC_KEY_GEN 0x8000000aUL
#define CKM_NETSCAPE_PBE_MD2_HMAC_KEY_GEN 0x8000000bL #define CKM_NETSCAPE_PBE_MD2_HMAC_KEY_GEN 0x8000000bUL
#define CKM_TLS_MASTER_KEY_DERIVE 0x80000371L #define CKM_TLS_MASTER_KEY_DERIVE 0x80000371UL
#define CKM_TLS_KEY_AND_MAC_DERIVE 0x80000372L #define CKM_TLS_KEY_AND_MAC_DERIVE 0x80000372UL
#define CKM_TLS_PRF_GENERAL 0x80000373L #define CKM_TLS_PRF_GENERAL 0x80000373UL
/* define used to pass in the database key for DSA private keys */ /* define used to pass in the database key for DSA private keys */
#define CKA_NETSCAPE_DB 0xD5A0DB00L #define CKA_NETSCAPE_DB 0xD5A0DB00UL
#define CKA_NETSCAPE_TRUST 0x80000001L #define CKA_NETSCAPE_TRUST 0x80000001UL
/* undo packing */ /* undo packing */
//#include "pkcs11u.h" // TODO: msc specific? //#include "pkcs11u.h" // TODO: msc specific?
ykcs11/ykcs11.c
+55 -8
View File
@@ -65,6 +65,7 @@ static struct {
CK_BBOOL active; CK_BBOOL active;
CK_MECHANISM mechanism; CK_MECHANISM mechanism;
CK_ULONG key; CK_ULONG key;
CK_ULONG key_len;
CK_BYTE algo; CK_BYTE algo;
} sign_info; } sign_info;
@@ -913,7 +914,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_FindObjectsInit)(
// TODO: do it properly here, just a test now // TODO: do it properly here, just a test now
//find_obj.objects = session.slot->token->objects + 3; //find_obj.objects = session.slot->token->objects + 3;
memmove(find_obj.objects, find_obj.objects + 14, sizeof(piv_obj_id_t) * (find_obj.num - 14)); memmove(find_obj.objects, find_obj.objects + 13, sizeof(piv_obj_id_t) * (find_obj.num - 13));
find_obj.num = 1; find_obj.num = 1;
DOUT; DOUT;
@@ -1165,6 +1166,14 @@ CK_DEFINE_FUNCTION(CK_RV, C_SignInit)(
) )
{ {
DIN; DIN;
CK_KEY_TYPE type = 0; // TODO: replace these with sign_info's fields?
CK_ULONG key_len = 0;
CK_BYTE buf[1024];
CK_ATTRIBUTE template[] = {
{CKA_KEY_TYPE, &type, sizeof(type)},
{CKA_MODULUS_BITS, &key_len, sizeof(key_len)},
{CKA_EC_POINT, buf, sizeof(buf)}
};
if (piv_state == NULL) { if (piv_state == NULL) {
DBG(("libykpiv is not initialized or already finalized")); DBG(("libykpiv is not initialized or already finalized"));
@@ -1186,16 +1195,53 @@ CK_DEFINE_FUNCTION(CK_RV, C_SignInit)(
// Check if mechanism is supported // Check if mechanism is supported
if (check_sign_mechanism(&session, pMechanism) != CKR_OK) { if (check_sign_mechanism(&session, pMechanism) != CKR_OK) {
DBG(("Mechanism %lu is not supported either by the token or the slot", pMechanism->mechanism)); DBG(("Mechanism %lu is not supported either by the token or the slot", pMechanism->mechanism));
return CKR_MECHANISM_INVALID; return CKR_MECHANISM_INVALID; // TODO: also the key has a list of allowed mechanisms, check that
} }
memcpy(&sign_info.mechanism, pMechanism, sizeof(CK_MECHANISM)); memcpy(&sign_info.mechanism, pMechanism, sizeof(CK_MECHANISM));
// Get key algorithm // Get key algorithm
/*if (get_key_algo(hKey, &sign_info.algo) != CKR_OK) { if (get_attribute(&session, hKey, template) != CKR_OK) {
DBG(("Unable to retrieve type for key %lu", hKey)); DBG(("Unable to get key type"));
return CKR_FUNCTION_FAILED; return CKR_KEY_HANDLE_INVALID;
}*/ // TODO: use get attribute instead? }
sign_info.algo = YKPIV_ALGO_RSA2048; // TODO: fix
DBG(("Key algorithm is %lu\n", type));
// Get key length and algorithm type
if (type == CKK_RSA) {
// RSA key
if (get_attribute(&session, hKey, template + 1) != CKR_OK) {
DBG(("Unable to get key length"));
return CKR_KEY_HANDLE_INVALID;
}
sign_info.key_len = key_len;
if (key_len == 1024)
sign_info.algo = YKPIV_ALGO_RSA1024;
else
sign_info.algo = YKPIV_ALGO_RSA2048;
}
else {
// ECDSA key
if (get_attribute(&session, hKey, template + 2) != CKR_OK) {
DBG(("Unable to get key length"));
return CKR_KEY_HANDLE_INVALID;
}
// The buffer contains an uncompressed point of the form 04, x, y
// TODO: is this a fine representation for an EC public key?
sign_info.key_len = ((template[2].ulValueLen - 1) / 2) * 8;
if (sign_info.key_len == 256)
sign_info.algo = YKPIV_ALGO_ECCP256;
/*else
sign_info.algo = ;*/
}
DBG(("Key length is %lu bit", sign_info.key_len));
//sign_info.key_len /= 8;
sign_info.key = piv_2_ykpiv(hKey); sign_info.key = piv_2_ykpiv(hKey);
if (sign_info.key == 0) { if (sign_info.key == 0) {
@@ -1203,6 +1249,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_SignInit)(
return CKR_KEY_HANDLE_INVALID; return CKR_KEY_HANDLE_INVALID;
} }
DBG(("Algorithm is %d", sign_info.algo));
// Make sure that both mechanism and key have the same algorithm // Make sure that both mechanism and key have the same algorithm
if ((is_RSA_mechanism(pMechanism->mechanism) && sign_info.algo == YKPIV_ALGO_ECCP256) || if ((is_RSA_mechanism(pMechanism->mechanism) && sign_info.algo == YKPIV_ALGO_ECCP256) ||
(!is_RSA_mechanism(pMechanism->mechanism) && (sign_info.algo != YKPIV_ALGO_ECCP256))) { (!is_RSA_mechanism(pMechanism->mechanism) && (sign_info.algo != YKPIV_ALGO_ECCP256))) {
@@ -1248,7 +1295,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_Sign)(
//dump_hex(buf, 256, stderr, CK_TRUE); //dump_hex(buf, 256, stderr, CK_TRUE);
//*pulSignatureLen = 256; //*pulSignatureLen = 256;
DBG(("Using key %lx", sign_info.key)); // TODO: test what happens if there is no key on the card DBG(("Using key %lx", sign_info.key)); // TODO: test what happens if there is no key on the card
if ((r = ykpiv_sign_data(piv_state, buf, ulDataLen, pSignature, pulSignatureLen, YKPIV_ALGO_RSA2048, sign_info.key)) != YKPIV_OK) { if ((r = ykpiv_sign_data(piv_state, buf, ulDataLen, pSignature, pulSignatureLen, sign_info.algo, sign_info.key)) != YKPIV_OK) {
DBG(("Sign error, %s", ykpiv_strerror(r))); DBG(("Sign error, %s", ykpiv_strerror(r)));
return CKR_FUNCTION_FAILED; return CKR_FUNCTION_FAILED;
} }