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

pkcs11: Use create_object_attr_enumerator to encode RSA public key.

Browse Source
This commit is contained in:
Tobias Brunner
2011-11-02 20:27:54 +01:00
parent b0319fe860
commit dae19d448d
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c
+7 -17
View File
@@ -178,35 +178,25 @@ METHOD(public_key_t, encrypt, bool,
static bool encode_rsa(private_pkcs11_public_key_t *this, static bool encode_rsa(private_pkcs11_public_key_t *this,
cred_encoding_type_t type, void *cache, chunk_t *encoding) cred_encoding_type_t type, void *cache, chunk_t *encoding)
{ {
CK_RV rv; enumerator_t *enumerator;
bool success = FALSE; bool success = FALSE;
chunk_t n, e;
CK_ATTRIBUTE attr[] = { CK_ATTRIBUTE attr[] = {
{CKA_MODULUS, NULL, 0}, {CKA_MODULUS, NULL, 0},
{CKA_PUBLIC_EXPONENT, NULL, 0}, {CKA_PUBLIC_EXPONENT, NULL, 0},
}; };
rv = this->lib->f->C_GetAttributeValue(this->session, this->object, enumerator = this->lib->create_object_attr_enumerator(this->lib,
attr, countof(attr)); this->session, this->object, attr, countof(attr));
if (rv != CKR_OK || if (enumerator && enumerator->enumerate(enumerator, NULL) &&
attr[0].ulValueLen == 0 || attr[0].ulValueLen == -1 || attr[0].ulValueLen > 0 && attr[1].ulValueLen > 0)
attr[1].ulValueLen == 0 || attr[1].ulValueLen == -1)
{
return FALSE;
}
attr[0].pValue = malloc(attr[0].ulValueLen);
attr[1].pValue = malloc(attr[1].ulValueLen);
rv = this->lib->f->C_GetAttributeValue(this->session, this->object,
attr, countof(attr));
if (rv == CKR_OK)
{ {
chunk_t n, e;
n = chunk_create(attr[0].pValue, attr[0].ulValueLen); n = chunk_create(attr[0].pValue, attr[0].ulValueLen);
e = chunk_create(attr[1].pValue, attr[1].ulValueLen); e = chunk_create(attr[1].pValue, attr[1].ulValueLen);
success = lib->encoding->encode(lib->encoding, type, cache, encoding, success = lib->encoding->encode(lib->encoding, type, cache, encoding,
CRED_PART_RSA_MODULUS, n, CRED_PART_RSA_PUB_EXP, e, CRED_PART_END); CRED_PART_RSA_MODULUS, n, CRED_PART_RSA_PUB_EXP, e, CRED_PART_END);
} }
free(attr[0].pValue); DESTROY_IF(enumerator);
free(attr[1].pValue);
return success; return success;
} }