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

YKCS11: Change DBG to print to stderr.

Browse Source
This commit is contained in:
Alessio Di Mauro
2015-11-05 15:26:59 +01:00
parent 98f3462e5e
commit 602208bf20
7 changed files with 318 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/objects.c
+76 -76
View File
@@ -242,11 +242,11 @@ CK_RV get_doa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
CK_BYTE_PTR data;
CK_BYTE tmp[64];
CK_ULONG len = 0;
DBG(("For data object %lu, get ", obj));
DBG("For data object %lu, get ", obj);
switch (template->type) {
case CKA_CLASS:
DBG(("CLASS"));
DBG("CLASS");
len = 1;
tmp[0] = CKO_DATA;
data = tmp;
@@ -254,51 +254,51 @@ CK_RV get_doa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
case CKA_TOKEN:
// Technically all these objects are token objects
DBG(("TOKEN"));
DBG("TOKEN");
len = 1;
tmp[0] = piv_objects[obj].token;
data = tmp;
break;
case CKA_PRIVATE:
DBG(("PRIVATE"));
DBG("PRIVATE");
len = 1;
tmp[0] = piv_objects[obj].private;
data = tmp;
break;
case CKA_LABEL:
DBG(("LABEL"));
DBG("LABEL");
len = strlen(piv_objects[obj].label) + 1;
data = (CK_BYTE_PTR) piv_objects[obj].label;
break;
case CKA_APPLICATION:
DBG(("APPLICATION"));
DBG("APPLICATION");
len = strlen(piv_objects[obj].label) + 1;
data = (CK_BYTE_PTR) piv_objects[obj].label;
break;
case CKA_VALUE: // TODO: this can be done with -r and -d|-a
DBG(("VALUE TODO!!!"));
DBG("VALUE TODO!!!");
return CKR_FUNCTION_FAILED;
case CKA_OBJECT_ID: // TODO: how about just storing the OID in DER ?
DBG(("OID"));
DBG("OID");
strcpy((char *)tmp, data_objects[piv_objects[obj].sub_id].oid);
asn1_encode_oid(tmp, tmp, &len);
data = tmp;
break;
case CKA_MODIFIABLE:
DBG(("MODIFIABLE"));
DBG("MODIFIABLE");
len = 1;
tmp[0] = piv_objects[obj].modifiable;
data = tmp;
break;
default:
DBG(("UNKNOWN ATTRIBUTE %lx", template[0].type));
DBG("UNKNOWN ATTRIBUTE %lx", template[0].type);
template->ulValueLen = CK_UNAVAILABLE_INFORMATION;
return CKR_ATTRIBUTE_TYPE_INVALID;
}
@@ -326,11 +326,11 @@ CK_RV get_coa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
CK_BYTE b_tmp[1024];
CK_ULONG ul_tmp;
CK_ULONG len = 0;
DBG(("For certificate object %lu, get ", obj));
DBG("For certificate object %lu, get ", obj);
switch (template->type) {
case CKA_CLASS:
DBG(("CLASS"));
DBG("CLASS");
len = sizeof(CK_ULONG);
ul_tmp = CKO_CERTIFICATE;
data = (CK_BYTE_PTR) &ul_tmp;
@@ -338,27 +338,27 @@ CK_RV get_coa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
case CKA_TOKEN:
// Technically all these objects are token objects
DBG(("TOKEN"));
DBG("TOKEN");
len = sizeof(CK_BBOOL);
b_tmp[0] = piv_objects[obj].token;
data = b_tmp;
break;
case CKA_PRIVATE:
DBG(("PRIVATE"));
DBG("PRIVATE");
len = sizeof(CK_BBOOL);
b_tmp[0] = piv_objects[obj].private;
data = b_tmp;
break;
case CKA_LABEL:
DBG(("LABEL"));
DBG("LABEL");
len = strlen(piv_objects[obj].label) + 1;
data = (CK_BYTE_PTR) piv_objects[obj].label;
break;
case CKA_VALUE:
DBG(("VALUE"));
DBG("VALUE");
len = sizeof(b_tmp);
if (get_raw_cert(cert_objects[piv_objects[obj].sub_id].data, b_tmp, &len) != CKR_OK)
return CKR_FUNCTION_FAILED;
@@ -366,48 +366,48 @@ CK_RV get_coa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_CERTIFICATE_TYPE:
DBG(("CERTIFICATE TYPE"));
DBG("CERTIFICATE TYPE");
len = sizeof(CK_ULONG);
ul_tmp = CKC_X_509; // Support only X.509 certs
data = (CK_BYTE_PTR) &ul_tmp;
break;
case CKA_ISSUER:
DBG(("ISSUER TODO")); // Default empty
DBG("ISSUER TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_SERIAL_NUMBER:
DBG(("SERIAL NUMBER TODO")); // Default empty
DBG("SERIAL NUMBER TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_SUBJECT:
DBG(("SUBJECT TODO")); // Required
DBG("SUBJECT TODO"); // Required
return CKR_FUNCTION_FAILED;
case CKA_ID:
DBG(("ID"));
DBG("ID");
len = sizeof(CK_BYTE);
b_tmp[0] = piv_objects[obj].sub_id;
data = b_tmp;
break;
case CKA_START_DATE:
DBG(("START DATE TODO")); // Default empty
DBG("START DATE TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_END_DATE:
DBG(("END DATE TODO")); // Default empty
DBG("END DATE TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_MODIFIABLE:
DBG(("MODIFIABLE"));
DBG("MODIFIABLE");
len = sizeof(CK_BBOOL);
b_tmp[0] = piv_objects[obj].modifiable;
data = b_tmp;
break;
default: // TODO: there are other attributes for a (x509) certificate
DBG(("UNKNOWN ATTRIBUTE %lx", template[0].type));
DBG("UNKNOWN ATTRIBUTE %lx", template[0].type);
template->ulValueLen = CK_UNAVAILABLE_INFORMATION;
return CKR_ATTRIBUTE_TYPE_INVALID;
}
@@ -435,11 +435,11 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
CK_BYTE b_tmp[1024];
CK_ULONG ul_tmp; // TODO: fix elsewhere too
CK_ULONG len = 0;
DBG(("For private key object %lu, get ", obj));
DBG("For private key object %lu, get ", obj);
switch (template->type) {
case CKA_CLASS:
DBG(("CLASS"));
DBG("CLASS");
len = sizeof(CK_ULONG);
ul_tmp = CKO_PRIVATE_KEY;
data = (CK_BYTE_PTR) &ul_tmp;
@@ -447,27 +447,27 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
case CKA_TOKEN:
// Technically all these objects are token objects
DBG(("TOKEN"));
DBG("TOKEN");
len = sizeof(CK_BBOOL);
b_tmp[0] = piv_objects[obj].token;
data = b_tmp;
break;
case CKA_PRIVATE:
DBG(("PRIVATE"));
DBG("PRIVATE");
len = sizeof(CK_BBOOL);
b_tmp[0] = piv_objects[obj].private;
data = b_tmp;
break;
case CKA_LABEL:
DBG(("LABEL"));
DBG("LABEL");
len = strlen(piv_objects[obj].label) + 1;
data =(CK_BYTE_PTR) piv_objects[obj].label;
break;
case CKA_KEY_TYPE:
DBG(("KEY TYPE"));
DBG("KEY TYPE");
len = sizeof(CK_ULONG);
ul_tmp = get_key_type(pubkey_objects[piv_objects[obj].sub_id].data); // Getting the info from the pubk
if (ul_tmp == CKK_VENDOR_DEFINED)
@@ -476,62 +476,62 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_SUBJECT:
DBG(("SUBJECT TODO")); // Default empty
DBG("SUBJECT TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_ID:
DBG(("ID"));
DBG("ID");
len = sizeof(CK_BYTE);
ul_tmp = piv_objects[obj].sub_id;
data = (CK_BYTE_PTR) &ul_tmp;
break;
case CKA_SENSITIVE:
DBG(("SENSITIVE TODO")); // Default empty
DBG("SENSITIVE TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_DECRYPT:
DBG(("DECRYPT")); // Default empty
DBG("DECRYPT"); // Default empy
len = sizeof(CK_BBOOL);
b_tmp[0] = pvtkey_objects[piv_objects[obj].sub_id].decrypt;
data = b_tmp;
break;
case CKA_UNWRAP:
DBG(("UNWRAP")); // Default empty
DBG("UNWRAP"); // Default empty
len = sizeof(CK_BBOOL);
b_tmp[0] = pvtkey_objects[piv_objects[obj].sub_id].unwrap;
data = b_tmp;
break;
case CKA_SIGN:
DBG(("SIGN")); // Default empty
DBG("SIGN"); // Default empty
len = sizeof(CK_BBOOL);
b_tmp[0] = pvtkey_objects[piv_objects[obj].sub_id].sign;
data = b_tmp;
break;
case CKA_SIGN_RECOVER:
DBG(("SIGN RECOVER TODO")); // Default empty
DBG("SIGN RECOVER TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_DERIVE:
DBG(("DERIVE")); // Default false
DBG("DERIVE"); // Default false
len = sizeof(CK_BBOOL);
b_tmp[0] = pvtkey_objects[piv_objects[obj].sub_id].derive;
data = b_tmp;
break;
case CKA_START_DATE:
DBG(("START DATE TODO")); // Default empty
DBG("START DATE TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_END_DATE:
DBG(("END DATE TODO")); // Default empty
DBG("END DATE TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_MODULUS:
DBG(("MODULUS"));
DBG("MODULUS");
len = sizeof(b_tmp);
// Make sure that this is an RSA key
@@ -547,7 +547,7 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_EC_POINT:
DBG(("EC_POINT"));
DBG("EC_POINT");
len = sizeof(b_tmp);
// Make sure that this is an EC key
@@ -564,7 +564,7 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
case CKA_EC_PARAMS:
// Here we want the curve parameters (DER encoded OID)
DBG(("EC_PARAMS"));
DBG("EC_PARAMS");
len = sizeof(b_tmp);
// Make sure that this is an EC key
@@ -581,7 +581,7 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_MODULUS_BITS:
DBG(("MODULUS BITS"));
DBG("MODULUS BITS");
len = sizeof(CK_ULONG);
// Make sure that this is an RSA key
@@ -598,7 +598,7 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_PUBLIC_EXPONENT:
DBG(("PUBLIC EXPONENT"));
DBG("PUBLIC EXPONENT");
len = sizeof(CK_ULONG);
// Make sure that this is an RSA key
@@ -627,21 +627,21 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
/* case CKA_VALUE_LEN: */
/* case CKA_EXTRACTABLE: */
case CKA_LOCAL:
DBG(("LOCAL TODO")); // Required
DBG("LOCAL TODO"); // Required
return CKR_FUNCTION_FAILED;
/* case CKA_NEVER_EXTRACTABLE: */
/*case CKA_ALWAYS_SENSITIVE:*/
case CKA_ALWAYS_AUTHENTICATE:
DBG(("ALWAYS AUTHENTICATE"));
DBG("ALWAYS AUTHENTICATE");
len = sizeof(CK_BBOOL);
b_tmp[0] = pvtkey_objects[piv_objects[obj].sub_id].always_auth;
data = b_tmp;
break;
case CKA_MODIFIABLE:
DBG(("MODIFIABLE"));
DBG("MODIFIABLE");
len = sizeof(CK_BBOOL);
b_tmp[0] = piv_objects[obj].modifiable;
data = b_tmp;
@@ -649,7 +649,7 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
/*case CKA_VENDOR_DEFINED:*/
default:
DBG(("UNKNOWN ATTRIBUTE %lx", template[0].type)); // TODO: there are other parameters for public keys, plus there is more if the key is RSA
DBG("UNKNOWN ATTRIBUTE %lx", template[0].type); // TODO: there are other parameters for public keys, plus there is more if the key is RSA
template->ulValueLen = CK_UNAVAILABLE_INFORMATION;
return CKR_ATTRIBUTE_TYPE_INVALID;
}
@@ -677,11 +677,11 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
CK_BYTE b_tmp[1024];
CK_ULONG ul_tmp;
CK_ULONG len = 0;
DBG(("For public key object %lu, get ", obj));
DBG("For public key object %lu, get ", obj);
switch (template->type) {
case CKA_CLASS:
DBG(("CLASS"));
DBG("CLASS");
len = sizeof(CK_ULONG);
ul_tmp = CKO_PUBLIC_KEY;
data = (CK_BYTE_PTR) &ul_tmp;
@@ -689,27 +689,27 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
case CKA_TOKEN:
// Technically all these objects are token objects
DBG(("TOKEN"));
DBG("TOKEN");
len = sizeof(CK_BBOOL);
b_tmp[0] = piv_objects[obj].token;
data = b_tmp;
break;
case CKA_PRIVATE:
DBG(("PRIVATE"));
DBG("PRIVATE");
len = sizeof(CK_BBOOL);
b_tmp[0] = piv_objects[obj].private;
data = b_tmp;
break;
case CKA_LABEL:
DBG(("LABEL"));
DBG("LABEL");
len = strlen(piv_objects[obj].label) + 1;
data = (CK_BYTE_PTR)piv_objects[obj].label;
break;
case CKA_KEY_TYPE:
DBG(("KEY TYPE"));
DBG("KEY TYPE");
len = sizeof(CK_ULONG);
ul_tmp = get_key_type(pubkey_objects[piv_objects[obj].sub_id].data);
if (ul_tmp == CKK_VENDOR_DEFINED) // This value is used as an error here
@@ -718,54 +718,54 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_SUBJECT:
DBG(("SUBJECT TODO")); // Default empty
DBG("SUBJECT TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_ID:
DBG(("ID"));
DBG("ID");
len = sizeof(CK_BYTE);
b_tmp[0] = piv_objects[obj].sub_id;
data = b_tmp;
break;
case CKA_ENCRYPT:
DBG(("ENCRYPT"));
DBG("ENCRYPT");
len = sizeof(CK_BBOOL);
b_tmp[0] = pubkey_objects[piv_objects[obj].sub_id].encrypt;
data = b_tmp;
break;
case CKA_VERIFY: // TODO: what about verify recover ?
DBG(("VERIFY"));
DBG("VERIFY");
len = sizeof(CK_BBOOL);
b_tmp[0] = pubkey_objects[piv_objects[obj].sub_id].verify;
data = b_tmp;
break;
case CKA_WRAP:
DBG(("WRAP"));
DBG("WRAP");
len = sizeof(CK_BBOOL);
b_tmp[0] = pubkey_objects[piv_objects[obj].sub_id].wrap;
data = b_tmp;
break;
case CKA_DERIVE:
DBG(("DERIVE"));
DBG("DERIVE");
len = sizeof(CK_BBOOL);
b_tmp[0] = pubkey_objects[piv_objects[obj].sub_id].derive;
data = b_tmp;
break;
case CKA_START_DATE:
DBG(("START DATE TODO")); // Default empty
DBG("START DATE TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_END_DATE:
DBG(("END DATE TODO")); // Default empty
DBG("END DATE TODO"); // Default empty
return CKR_FUNCTION_FAILED;
case CKA_EC_POINT:
DBG(("EC_POINT"));
DBG("EC_POINT");
len = sizeof(b_tmp);
// Make sure that this is an EC key
@@ -782,7 +782,7 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
case CKA_EC_PARAMS:
// Here we want the curve parameters (DER encoded OID)
DBG(("EC_PARAMS"));
DBG("EC_PARAMS");
len = sizeof(b_tmp);
// Make sure that this is an EC key
@@ -799,7 +799,7 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_MODULUS:
DBG(("MODULUS"));
DBG("MODULUS");
len = sizeof(b_tmp);
// Make sure that this is an RSA key
@@ -815,7 +815,7 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_MODULUS_BITS:
DBG(("MODULUS BITS"));
DBG("MODULUS BITS");
len = sizeof(CK_ULONG);
// Make sure that this is an RSA key
@@ -832,7 +832,7 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_PUBLIC_EXPONENT:
DBG(("PUBLIC EXPONENT"));
DBG("PUBLIC EXPONENT");
len = sizeof(CK_ULONG);
// Make sure that this is an RSA key
@@ -849,18 +849,18 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break;
case CKA_LOCAL:
DBG(("LOCAL TODO")); // Required
DBG("LOCAL TODO"); // Required
return CKR_FUNCTION_FAILED;
case CKA_MODIFIABLE:
DBG(("MODIFIABLE"));
DBG("MODIFIABLE");
len = sizeof(CK_BBOOL);
b_tmp[0] = piv_objects[obj].modifiable;
data = b_tmp;
break;
default:
DBG(("UNKNOWN ATTRIBUTE %lx", template[0].type)); // TODO: there are other parameters for public keys
DBG("UNKNOWN ATTRIBUTE %lx", template[0].type); // TODO: there are other parameters for public keys
template->ulValueLen = CK_UNAVAILABLE_INFORMATION;
return CKR_ATTRIBUTE_TYPE_INVALID;
}
@@ -990,7 +990,7 @@ CK_RV get_available_certificate_ids(ykcs11_session_t *s, piv_obj_id_t *cert_ids,
if (IS_CERT(s->slot->token->objects[i]) == CK_TRUE)
cert_ids[j++] = s->slot->token->objects[i];
DBG(("Just to check: %lu %lu", j, n_certs));
DBG("Just to check: %lu %lu", j, n_certs);
return CKR_OK;
}
@@ -1066,7 +1066,7 @@ CK_RV check_create_cert(CK_ATTRIBUTE_PTR templ, CK_ULONG n,
break;
default:
DBG(("Invalid %lx", templ[i].type));
DBG("Invalid %lx", templ[i].type);
return CKR_ATTRIBUTE_TYPE_INVALID;
}
}
@@ -1139,7 +1139,7 @@ CK_RV check_create_ec_key(CK_ATTRIBUTE_PTR templ, CK_ULONG n, CK_BYTE_PTR id,
break;
default:
DBG(("Invalid %lx", templ[i].type));
DBG("Invalid %lx", templ[i].type);
return CKR_ATTRIBUTE_TYPE_INVALID;
}
}
@@ -1254,7 +1254,7 @@ CK_RV check_create_rsa_key(CK_ATTRIBUTE_PTR templ, CK_ULONG n, CK_BYTE_PTR id,
break;
default:
DBG(("Invalid %lx", templ[i].type));
DBG("Invalid %lx", templ[i].type);
return CKR_ATTRIBUTE_TYPE_INVALID;
}
}