denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkcs11: Use get_ck_attribute for DH.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-31 18:45:37 +01:00
parent 8531106578
commit cac6853180
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/pkcs11/pkcs11_dh.c
+6 -28
View File
@@ -64,32 +64,6 @@ struct private_pkcs11_dh_t {
}; };
/**
* Retrieve a CKA_VALUE from a CK_OBJECT_HANDLE, memory gets allocated
*/
static bool get_cka_value(private_pkcs11_dh_t *this, CK_OBJECT_HANDLE obj,
chunk_t *value)
{
CK_ATTRIBUTE attr = { CKA_VALUE, NULL, 0 };
CK_RV rv;
rv = this->lib->f->C_GetAttributeValue(this->session, obj, &attr, 1);
if (rv != CKR_OK)
{
DBG1(DBG_CFG, "C_GetAttributeValue(NULL) error: %N", ck_rv_names, rv);
return FALSE;
}
*value = chunk_alloc(attr.ulValueLen);
attr.pValue = value->ptr;
rv = this->lib->f->C_GetAttributeValue(this->session, obj, &attr, 1);
if (rv != CKR_OK)
{
DBG1(DBG_CFG, "C_GetAttributeValue() error: %N", ck_rv_names, rv);
chunk_free(value);
return FALSE;
}
return TRUE;
}
METHOD(diffie_hellman_t, set_other_public_value, void, METHOD(diffie_hellman_t, set_other_public_value, void,
private_pkcs11_dh_t *this, chunk_t value) private_pkcs11_dh_t *this, chunk_t value)
{ {
@@ -114,8 +88,10 @@ METHOD(diffie_hellman_t, set_other_public_value, void,
DBG1(DBG_CFG, "C_DeriveKey() error: %N", ck_rv_names, rv); DBG1(DBG_CFG, "C_DeriveKey() error: %N", ck_rv_names, rv);
return; return;
} }
if (!get_cka_value(this, secret, &this->secret)) if (!this->lib->get_ck_attribute(this->lib, this->session, secret,
CKA_VALUE, &this->secret))
{ {
chunk_free(&this->secret);
return; return;
} }
} }
@@ -183,8 +159,10 @@ static bool generate_key_pair(private_pkcs11_dh_t *this, size_t exp_len,
return FALSE; return FALSE;
} }
if (!get_cka_value(this, pub_key, &this->pub_key)) if (!this->lib->get_ck_attribute(this->lib, this->session, pub_key,
CKA_VALUE, &this->pub_key))
{ {
chunk_free(&this->pub_key);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;