ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'openssl-keyid' 

Closes strongswan/strongswan#116.
This commit is contained in:
Tobias Brunner 2018-10-24 10:07:49 +02:00
parent d99e73548e 6b3dfe9c38
commit 9b5b55b026
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libstrongswan/plugins/openssl/openssl_plugin.c
View File

@ -370,7 +370,7 @@ static private_key_t *openssl_private_key_connect(key_type_t type,
#ifndef OPENSSL_NO_ENGINE
char *engine_id = NULL;
char keyname[BUF_LEN];
chunk_t keyid = chunk_empty;;
chunk_t keyid = chunk_empty;
EVP_PKEY *key;
ENGINE *engine;
int slot = -1;
@ -395,7 +395,7 @@ static private_key_t *openssl_private_key_connect(key_type_t type,
}
break;
}
if (!keyid.len || keyid.len > 40)
if (!keyid.len)
{
return NULL;
}
@ -405,7 +405,7 @@ static private_key_t *openssl_private_key_connect(key_type_t type,
{
snprintf(keyname, sizeof(keyname), "%d:", slot);
}
if (sizeof(keyname) - strlen(keyname) <= keyid.len * 4 / 3 + 1)
if (sizeof(keyname) - strlen(keyname) <= keyid.len * 2 + 1)
{
return NULL;
}