diff options
author | Martin Willi <martin@revosec.ch> | 2013-10-25 17:30:27 +0200 |
---|---|---|
committer | Martin Willi <martin@revosec.ch> | 2014-06-04 15:53:03 +0200 |
commit | 06c33ebf6a7abea85dfece0ada532c60b69628a5 (patch) | |
tree | 69b8774aaf227613eef553f2644776639149ba81 /src | |
parent | 4f310a2e7538741471f708dc4d23e06d081a2165 (diff) | |
download | strongswan-06c33ebf6a7abea85dfece0ada532c60b69628a5.tar.bz2 strongswan-06c33ebf6a7abea85dfece0ada532c60b69628a5.tar.xz |
openssl: Fix includes to prevent <winsock2.h> to complain about include order
Diffstat (limited to 'src')
-rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_plugin.c | 12 | ||||
-rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_rng.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c index f4aef8200..372a480fa 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c @@ -14,6 +14,12 @@ * for more details. */ +#include <library.h> +#include <utils/debug.h> +#include <threading/thread.h> +#include <threading/mutex.h> +#include <threading/thread_value.h> + #include <openssl/err.h> #include <openssl/evp.h> #include <openssl/conf.h> @@ -24,12 +30,6 @@ #endif #include "openssl_plugin.h" - -#include <library.h> -#include <utils/debug.h> -#include <threading/thread.h> -#include <threading/mutex.h> -#include <threading/thread_value.h> #include "openssl_util.h" #include "openssl_crypter.h" #include "openssl_hasher.h" diff --git a/src/libstrongswan/plugins/openssl/openssl_rng.c b/src/libstrongswan/plugins/openssl/openssl_rng.c index 815cf4f0c..c807bb607 100644 --- a/src/libstrongswan/plugins/openssl/openssl_rng.c +++ b/src/libstrongswan/plugins/openssl/openssl_rng.c @@ -20,7 +20,9 @@ * THE SOFTWARE. */ +#include <library.h> #include <utils/debug.h> + #include <openssl/rand.h> #include <openssl/err.h> |