Fixing compilation of the OpenSSL plugin if Elliptic Curve support is disabled.

That is, enable compilation if OpenSSL was configured with
OPENSSL_NO_EC.

diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c b/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
index faec411cdfa75dda5417e74db0c2ffecf1cd1b88..a53e8aea0cab3477e6d4e1289da259362a51b23b 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
+++ b/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
@@ -13,6 +13,10 @@
  * for more details.
  */
 
+#include <openssl/opensslconf.h>
+
+#ifndef OPENSSL_NO_EC
+
 #include <openssl/ec.h>
 #include <openssl/objects.h>
 
@@ -331,3 +335,5 @@ openssl_ec_diffie_hellman_t *openssl_ec_diffie_hellman_create(diffie_hellman_gro
 
        return &this->public;
 }
+#endif /* OPENSSL_NO_EC */
+

diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c b/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
index bdcfda974bf6ce5d5722c0e325bc5d0404db3a3c..ca9fa6d79d0fa4e96010da3c736a6e8e81e1dd4d 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
@@ -14,6 +14,10 @@
  * for more details.
  */
 
+#include <openssl/opensslconf.h>
+
+#ifndef OPENSSL_NO_EC
+
 #include "openssl_ec_private_key.h"
 #include "openssl_ec_public_key.h"
 #include "openssl_util.h"
@@ -402,4 +406,5 @@ openssl_ec_private_key_t *openssl_ec_private_key_load(key_type_t type,
        }
        return &this->public;
 }
+#endif /* OPENSSL_NO_EC */
 

diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c b/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
index 790a8487d92b7c3ca77c505f8bc603365f246546..8895f821880fa16028064d1f1a49cae20dddb903 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
@@ -14,6 +14,10 @@
  * for more details.
  */
 
+#include <openssl/opensslconf.h>
+
+#ifndef OPENSSL_NO_EC
+
 #include "openssl_ec_public_key.h"
 #include "openssl_util.h"
 
@@ -358,4 +362,5 @@ openssl_ec_public_key_t *openssl_ec_public_key_load(key_type_t type,
        }
        return &this->public;
 }
+#endif /* OPENSSL_NO_EC */
 

diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c
index 218967b716aa73641a954e383bde200d885e6c22..2a97dbcc3552946cabf369d075e757f2a30ca384 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_plugin.c
+++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c
@@ -177,8 +177,6 @@ static void destroy(private_openssl_plugin_t *this)
                                        (prf_constructor_t)openssl_sha1_prf_create);
        lib->crypto->remove_dh(lib->crypto,
                                        (dh_constructor_t)openssl_diffie_hellman_create);
-       lib->crypto->remove_dh(lib->crypto,
-                                       (dh_constructor_t)openssl_ec_diffie_hellman_create);
        lib->creds->remove_builder(lib->creds,
                                        (builder_function_t)openssl_rsa_private_key_load);
        lib->creds->remove_builder(lib->creds,
@@ -187,12 +185,16 @@ static void destroy(private_openssl_plugin_t *this)
                                        (builder_function_t)openssl_rsa_private_key_connect);
        lib->creds->remove_builder(lib->creds,
                                        (builder_function_t)openssl_rsa_public_key_load);
+#ifndef OPENSSL_NO_EC
+       lib->crypto->remove_dh(lib->crypto,
+                                       (dh_constructor_t)openssl_ec_diffie_hellman_create);
        lib->creds->remove_builder(lib->creds,
                                        (builder_function_t)openssl_ec_private_key_load);
        lib->creds->remove_builder(lib->creds,
                                        (builder_function_t)openssl_ec_private_key_gen);
        lib->creds->remove_builder(lib->creds,
                                        (builder_function_t)openssl_ec_public_key_load);
+#endif /* OPENSSL_NO_EC */
        lib->creds->remove_builder(lib->creds,
                                        (builder_function_t)openssl_x509_load);
        lib->creds->remove_builder(lib->creds,
@@ -278,6 +280,7 @@ plugin_t *openssl_plugin_create()
                                                (dh_constructor_t)openssl_diffie_hellman_create);
        lib->crypto->add_dh(lib->crypto, MODP_1536_BIT,
                                                (dh_constructor_t)openssl_diffie_hellman_create);
+#ifndef OPENSSL_NO_EC
        lib->crypto->add_dh(lib->crypto, ECP_256_BIT,
                                                (dh_constructor_t)openssl_ec_diffie_hellman_create);
        lib->crypto->add_dh(lib->crypto, ECP_384_BIT,
@@ -288,6 +291,7 @@ plugin_t *openssl_plugin_create()
                                                (dh_constructor_t)openssl_ec_diffie_hellman_create);
        lib->crypto->add_dh(lib->crypto, ECP_192_BIT,
                                                (dh_constructor_t)openssl_ec_diffie_hellman_create);
+#endif /* OPENSSL_NO_EC */
        lib->crypto->add_dh(lib->crypto, MODP_3072_BIT,
                                                (dh_constructor_t)openssl_diffie_hellman_create);
        lib->crypto->add_dh(lib->crypto, MODP_4096_BIT,
@@ -315,13 +319,15 @@ plugin_t *openssl_plugin_create()
        lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_ANY,
                                        (builder_function_t)openssl_rsa_public_key_load);
 
-       /* ec */
+#ifndef OPENSSL_NO_EC
+       /* ecdsa */
        lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ECDSA,
                                        (builder_function_t)openssl_ec_private_key_load);
        lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ECDSA,
                                        (builder_function_t)openssl_ec_private_key_gen);
        lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_ECDSA,
                                        (builder_function_t)openssl_ec_public_key_load);
+#endif /* OPENSSL_NO_EC */
 
        /* X509 certificates */
        lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_X509,