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

openssl: Properly honor OPENSSL_NO_* defines

Browse Source
This commit is contained in:
Tobias Brunner 2013-01-31 17:33:23 +01:00
parent 25637aa5d8
commit a3a190b7bd
7 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,10 @@
* for more details.
*/
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>
#include "openssl_diffie_hellman.h"
@ -193,3 +197,5 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create(
return &this->public;
}
#endif /* OPENSSL_NO_DH */

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

@ -16,7 +16,7 @@
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_EC
#ifndef OPENSSL_NO_ECDSA
#include "openssl_ec_private_key.h"
#include "openssl_ec_public_key.h"
@ -423,5 +423,4 @@ error:
destroy(this);
return NULL;
}
#endif /* OPENSSL_NO_EC */
#endif /* OPENSSL_NO_ECDSA */

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

@ -16,7 +16,7 @@
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_EC
#ifndef OPENSSL_NO_ECDSA
#include "openssl_ec_public_key.h"
#include "openssl_util.h"
@ -360,5 +360,5 @@ openssl_ec_public_key_t *openssl_ec_public_key_load(key_type_t type,
}
return &this->public;
}
#endif /* OPENSSL_NO_EC */
#endif /* OPENSSL_NO_ECDSA */

5
src/libstrongswan/plugins/openssl/openssl_hmac.c
View File

@ -35,6 +35,10 @@
* THE SOFTWARE.
*/
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_HMAC
#include <openssl/evp.h>
#include <openssl/hmac.h>
@ -189,3 +193,4 @@ signer_t *openssl_hmac_signer_create(integrity_algorithm_t algo)
return NULL;
}
#endif /* OPENSSL_NO_HMAC */

5
src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
View File

@ -14,6 +14,10 @@
* for more details.
*/
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_RSA
#include "openssl_rsa_private_key.h"
#include "openssl_rsa_public_key.h"
@ -599,3 +603,4 @@ openssl_rsa_private_key_t *openssl_rsa_private_key_connect(key_type_t type,
#endif /* OPENSSL_NO_ENGINE */
}
#endif /* OPENSSL_NO_RSA */

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

@ -14,6 +14,10 @@
* for more details.
*/
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_RSA
#include "openssl_rsa_public_key.h"
#include <utils/debug.h>
@ -388,3 +392,5 @@ openssl_rsa_public_key_t *openssl_rsa_public_key_load(key_type_t type,
destroy(this);
return NULL;
}
#endif /* OPENSSL_NO_RSA */

5
src/libstrongswan/plugins/openssl/openssl_sha1_prf.c
View File

@ -13,6 +13,10 @@
* for more details.
*/
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_SHA1
#include "openssl_sha1_prf.h"
#include <openssl/sha.h>
@ -143,3 +147,4 @@ openssl_sha1_prf_t *openssl_sha1_prf_create(pseudo_random_function_t algo)
return &this->public;
}
#endif /* OPENSSL_NO_SHA1 */