sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-15 00:00:16 -04:00
Code Issues Projects Releases Wiki Activity

openssl: Report correct key length for EC keys when not using NIST curves

Browse Source 
Fixes #688.
This commit is contained in:
Tobias Brunner 2014-08-26 18:26:33 +02:00
parent 8d80528a60
commit 5818467639
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
View File

@ -181,17 +181,7 @@ METHOD(private_key_t, decrypt, bool,
METHOD(private_key_t, get_keysize, int, METHOD(private_key_t, get_keysize, int,
private_openssl_ec_private_key_t *this) private_openssl_ec_private_key_t *this)
{ {
switch (EC_GROUP_get_curve_name(EC_KEY_get0_group(this->ec))) return EC_GROUP_get_degree(EC_KEY_get0_group(this->ec));
{
case NID_X9_62_prime256v1:
return 256;
case NID_secp384r1:
return 384;
case NID_secp521r1:
return 521;
default:
return 0;
}
} }
METHOD(private_key_t, get_type, key_type_t, METHOD(private_key_t, get_type, key_type_t,

12
src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
View File

@ -179,17 +179,7 @@ METHOD(public_key_t, encrypt, bool,
METHOD(public_key_t, get_keysize, int, METHOD(public_key_t, get_keysize, int,
private_openssl_ec_public_key_t *this) private_openssl_ec_public_key_t *this)
{ {
switch (EC_GROUP_get_curve_name(EC_KEY_get0_group(this->ec))) return EC_GROUP_get_degree(EC_KEY_get0_group(this->ec));
{
case NID_X9_62_prime256v1:
return 256;
case NID_secp384r1:
return 384;
case NID_secp521r1:
return 521;
default:
return 0;
}
} }
/** /**