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

Pass the PKCS11 keyid as chunk, not as string

Browse Source
This commit is contained in:
Martin Willi
2010-08-04 09:26:20 +02:00
parent 353d10d590
commit 0b8b664056
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
+12 -9
View File
@@ -451,9 +451,9 @@ openssl_rsa_private_key_t *openssl_rsa_private_key_connect(key_type_t type,
{
#ifndef OPENSSL_NO_ENGINE
private_openssl_rsa_private_key_t *this;
char *keyid = NULL, *engine_id = NULL;
char *engine_id = NULL;
char keyname[64], pin[32];;
chunk_t secret = chunk_empty;
chunk_t secret = chunk_empty, keyid = chunk_empty;;
EVP_PKEY *key;
ENGINE *engine;
int slot = -1;
@@ -463,7 +463,7 @@ openssl_rsa_private_key_t *openssl_rsa_private_key_connect(key_type_t type,
switch (va_arg(args, builder_part_t))
{
case BUILD_PKCS11_KEYID:
keyid = va_arg(args, char*);
keyid = va_arg(args, chunk_t);
continue;
case BUILD_PASSPHRASE:
secret = va_arg(args, chunk_t);
@@ -481,19 +481,22 @@ openssl_rsa_private_key_t *openssl_rsa_private_key_connect(key_type_t type,
}
break;
}
if (!keyid || !secret.len || !secret.ptr)
if (!keyid.len || keyid.len > 40 || !secret.len)
{
return NULL;
}
if (slot == -1)
memset(keyname, 0, sizeof(keyname));
if (slot != -1)
{
snprintf(keyname, sizeof(keyname), "%s", keyid);
snprintf(keyname, sizeof(keyname), "%d:", slot);
}
else
if (sizeof(keyname) - strlen(keyname) <= keyid.len * 4 / 3 + 1)
{
snprintf(keyname, sizeof(keyname), "%d:%s", slot, keyid);
return NULL;
}
chunk_to_hex(keyid, keyname + strlen(keyname), FALSE);
snprintf(pin, sizeof(pin), "%.*s", secret.len, secret.ptr);
if (!engine_id)
@@ -504,7 +507,7 @@ openssl_rsa_private_key_t *openssl_rsa_private_key_connect(key_type_t type,
engine = ENGINE_by_id(engine_id);
if (!engine)
{
DBG1(DBG_LIB, "engine '%s' is not available", engine_id);
DBG2(DBG_LIB, "engine '%s' is not available", engine_id);
return NULL;
}
if (!ENGINE_init(engine))
src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
+6 -8
View File
@@ -276,17 +276,18 @@ static bool find_key(private_pkcs11_private_key_t *this, chunk_t keyid)
pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
{
private_pkcs11_private_key_t *this;
char *keyid = NULL, *module = NULL;
char *module = NULL;
chunk_t keyid, pin;
int slot = -1;
CK_RV rv;
chunk_t chunk, pin = chunk_empty;
keyid = pin = chunk_empty;
while (TRUE)
{
switch (va_arg(args, builder_part_t))
{
case BUILD_PKCS11_KEYID:
keyid = va_arg(args, char*);
keyid = va_arg(args, chunk_t);
continue;
case BUILD_PASSPHRASE:
pin = va_arg(args, chunk_t);
@@ -304,7 +305,7 @@ pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
}
break;
}
if (!keyid || !pin.ptr || !pin.len || !module || slot == -1)
if (!keyid.len || !pin.len || !module || slot == -1)
{ /* we currently require all parameters, TODO: search for pubkeys */
return NULL;
}
@@ -356,14 +357,11 @@ pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
return NULL;
}
chunk = chunk_from_hex(chunk_create(keyid, strlen(keyid)), NULL);
if (!find_key(this, chunk))
if (!find_key(this, keyid))
{
free(chunk.ptr);
destroy(this);
return NULL;
}
free(chunk.ptr);
return &this->public;
}