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

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

Browse Source 
That is, enable compilation if OpenSSL was configured with
OPENSSL_NO_EC.
This commit is contained in:
Tobias Brunner
2010-06-22 11:55:33 +02:00
parent 5d31217232
commit 5a367e99c3
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
+6
View File
@@ -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 */
src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
+5
View File
@@ -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 */
src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
+5
View File
@@ -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 */
src/libstrongswan/plugins/openssl/openssl_plugin.c
+9 -3
View File
@@ -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,