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

Fixes #688.

diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c b/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
index 12f264267efc3eecc014a987cfcb14734011b7fb..bc7884c99b0138792614702b603793819f720def 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
@@ -181,17 +181,7 @@ METHOD(private_key_t, decrypt, bool,
 METHOD(private_key_t, get_keysize, int,
        private_openssl_ec_private_key_t *this)
 {
-       switch (EC_GROUP_get_curve_name(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;
-       }
+       return EC_GROUP_get_degree(EC_KEY_get0_group(this->ec));
 }
 
 METHOD(private_key_t, get_type, key_type_t,

diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c b/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
index 382c5541861afebf7f53b8f631d23c8eff85cc98..21dcb0120710272b98bd31837265bb701173a0d1 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
@@ -179,17 +179,7 @@ METHOD(public_key_t, encrypt, bool,
 METHOD(public_key_t, get_keysize, int,
        private_openssl_ec_public_key_t *this)
 {
-       switch (EC_GROUP_get_curve_name(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;
-       }
+       return EC_GROUP_get_degree(EC_KEY_get0_group(this->ec));
 }
 
 /**