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

fix PSS signing support

Browse Source
This commit is contained in:
Hannes Mehnert
2017-03-26 19:13:07 +02:00
parent 8e91c8ea2f
commit 847b0b4267
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/ykcs11.c
+20 -4
View File
@@ -1687,11 +1687,13 @@ CK_DEFINE_FUNCTION(CK_RV, C_SignInit)(
{
CK_KEY_TYPE type = 0;
CK_ULONG key_len = 0;
CK_BYTE exp[3];
CK_BYTE buf[1024];
CK_ATTRIBUTE template[] = {
{CKA_KEY_TYPE, &type, sizeof(type)},
{CKA_MODULUS_BITS, &key_len, sizeof(key_len)},
{CKA_MODULUS, NULL, 0},
{CKA_PUBLIC_EXPONENT, exp, sizeof(exp)},
{CKA_EC_POINT, buf, sizeof(buf)},
};
@@ -1754,18 +1756,32 @@ CK_DEFINE_FUNCTION(CK_RV, C_SignInit)(
// Also store the raw public key if the mechanism is PSS
if (is_PSS_mechanism(pMechanism->mechanism)) {
op_info.op.sign.key = malloc(key_len);
op_info.op.sign.key = RSA_new();
if (op_info.op.sign.key == NULL)
return CKR_HOST_MEMORY;
template[2].pValue = op_info.op.sign.key;
template[2].ulValueLen = key_len;
template[2].pValue = buf;
template[2].ulValueLen = (key_len + 7) / 8 ;
if (get_attribute(&session, hKey, template + 2) != CKR_OK) {
DBG("Unable to get public key");
return CKR_KEY_HANDLE_INVALID;
}
op_info.op.sign.key->n = BN_bin2bn(buf, (key_len + 7) / 8, NULL);
if(op_info.op.sign.key->n == NULL) {
DBG("Failed to parse public key modulus.");
return CKR_KEY_HANDLE_INVALID;
}
if (get_attribute(&session, hKey, template + 3) != CKR_OK) {
DBG("Unable to get public exponent");
return CKR_KEY_HANDLE_INVALID;
}
op_info.op.sign.key->e = BN_bin2bn(exp, sizeof(exp), NULL);
if(op_info.op.sign.key->e == NULL) {
DBG("Failed to parse public key exponent.");
return CKR_KEY_HANDLE_INVALID;
}
}
else {
op_info.op.sign.key = NULL;
@@ -1774,7 +1790,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_SignInit)(
}
else {
// ECDSA key
if (get_attribute(&session, hKey, template + 3) != CKR_OK) {
if (get_attribute(&session, hKey, template + 4) != CKR_OK) {
DBG("Unable to get key length");
return CKR_KEY_HANDLE_INVALID;
}