diff options
author | Fernando Fernandez Mancera <ffmancera@riseup.net> | 2018-01-22 16:48:33 +0100 |
---|---|---|
committer | Fernando Fernandez Mancera <ffmancera@riseup.net> | 2018-01-22 16:48:33 +0100 |
commit | f2fca519762cdd37c8559eb95bb8b41973225d38 (patch) | |
tree | ef672d8fdea336ecfbf45bf07dbe35e51fa5cb3c /src/common/crypto.c | |
parent | 5cd74b4884d35b43e464a3dcc6125f7ca2a3b0e3 (diff) | |
download | tor-f2fca519762cdd37c8559eb95bb8b41973225d38.tar.gz tor-f2fca519762cdd37c8559eb95bb8b41973225d38.zip |
Move the openssl namespace back into .c files.
As we're trying not to have all the other modules in Tor, we moved the openssl
namespace includes back into crypto.c and crypto_openssl_mgt.c files.
Follows #24658.
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Diffstat (limited to 'src/common/crypto.c')
-rw-r--r-- | src/common/crypto.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 96a1f7c007..3fba2da5d9 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -29,6 +29,21 @@ #include "crypto_ed25519.h" #include "crypto_format.h" +DISABLE_GCC_WARNING(redundant-decls) + +#include <openssl/err.h> +#include <openssl/rsa.h> +#include <openssl/pem.h> +#include <openssl/evp.h> +#include <openssl/engine.h> +#include <openssl/rand.h> +#include <openssl/bn.h> +#include <openssl/dh.h> +#include <openssl/conf.h> +#include <openssl/hmac.h> + +ENABLE_GCC_WARNING(redundant-decls) + #if __GNUC__ && GCC_VERSION >= 402 #if GCC_VERSION >= 406 #pragma GCC diagnostic pop |