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

Export more info for EC keys too.

Browse Source
This commit is contained in:
Alessio Di Mauro
2015-09-17 16:46:04 +02:00
parent 2ea35bbd18
commit bae1005fb4
1 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/objects.c
+42 -3
View File
@@ -538,15 +538,39 @@ CK_RV get_proa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
break; break;
case CKA_EC_POINT: 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
DBG(("EC_POINT")); DBG(("EC_POINT"));
len = sizeof(b_tmp); len = sizeof(b_tmp);
// Make sure that this is an EC key
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)
return CKR_FUNCTION_FAILED;
if (ul_tmp != CKK_ECDSA)
return CKR_ATTRIBUTE_VALUE_INVALID;
if (get_public_key(pubkey_objects[piv_objects[obj].sub_id].data, b_tmp, &len) != CKR_OK) if (get_public_key(pubkey_objects[piv_objects[obj].sub_id].data, b_tmp, &len) != CKR_OK)
return CKR_FUNCTION_FAILED; return CKR_FUNCTION_FAILED;
data = b_tmp; data = b_tmp;
break; break;
case CKA_EC_PARAMS:
// Here we want the curve parameters (DER encoded OID)
DBG(("EC_PARAMS"));
len = sizeof(b_tmp);
// Make sure that this is an EC key
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)
return CKR_FUNCTION_FAILED;
if (ul_tmp != CKK_ECDSA)
return CKR_ATTRIBUTE_VALUE_INVALID;
if (get_curve_parameters(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: case CKA_MODULUS_BITS:
DBG(("MODULUS BITS")); DBG(("MODULUS BITS"));
len = sizeof(CK_ULONG); len = sizeof(CK_ULONG);
@@ -732,9 +756,16 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
return CKR_FUNCTION_FAILED; return CKR_FUNCTION_FAILED;
case CKA_EC_POINT: case CKA_EC_POINT:
// We're trying to get the key length, get the ec point of the PUBLIC key
DBG(("EC_POINT")); DBG(("EC_POINT"));
len = sizeof(b_tmp); len = sizeof(b_tmp);
// Make sure that this is an EC key
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)
return CKR_FUNCTION_FAILED;
if (ul_tmp != CKK_ECDSA)
return CKR_ATTRIBUTE_VALUE_INVALID;
if (get_public_key(pubkey_objects[piv_objects[obj].sub_id].data, b_tmp, &len) != CKR_OK) if (get_public_key(pubkey_objects[piv_objects[obj].sub_id].data, b_tmp, &len) != CKR_OK)
return CKR_FUNCTION_FAILED; return CKR_FUNCTION_FAILED;
data = b_tmp; data = b_tmp;
@@ -744,6 +775,14 @@ CK_RV get_puoa(CK_OBJECT_HANDLE obj, CK_ATTRIBUTE_PTR template) {
// Here we want the curve parameters (DER encoded OID) // Here we want the curve parameters (DER encoded OID)
DBG(("EC_PARAMS")); DBG(("EC_PARAMS"));
len = sizeof(b_tmp); len = sizeof(b_tmp);
// Make sure that this is an EC key
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)
return CKR_FUNCTION_FAILED;
if (ul_tmp != CKK_ECDSA)
return CKR_ATTRIBUTE_VALUE_INVALID;
if (get_curve_parameters(pubkey_objects[piv_objects[obj].sub_id].data, b_tmp, &len) != CKR_OK) if (get_curve_parameters(pubkey_objects[piv_objects[obj].sub_id].data, b_tmp, &len) != CKR_OK)
return CKR_FUNCTION_FAILED; return CKR_FUNCTION_FAILED;