[tor-commits] [tor/master] Remove some now-needless openssl includes from src/test.

nickm at torproject.org nickm at torproject.org
Fri Apr 7 13:59:42 UTC 2017


commit 706c44a6ce0bbeee51c800521a3199d76e1dcd96
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 25 12:19:14 2017 +0100

    Remove some now-needless openssl includes from src/test.
    
    It would appear that these includes weren't actually used.
---
 src/test/test_crypto_slow.c | 3 ---
 src/test/test_microdesc.c   | 6 ------
 src/test/test_rendcache.c   | 1 -
 3 files changed, 10 deletions(-)

diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 6d676ff..d6b0a43 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -12,11 +12,8 @@
 
 #if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT)
 #define HAVE_LIBSCRYPT
-#include <libscrypt.h>
 #endif
 
-#include <openssl/evp.h>
-
 /** Run unit tests for our secret-to-key passphrase hashing functionality. */
 static void
 test_crypto_s2k_rfc2440(void *arg)
diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c
index b8d9649..c78fda3 100644
--- a/src/test/test_microdesc.c
+++ b/src/test/test_microdesc.c
@@ -14,12 +14,6 @@
 
 #include "test.h"
 
-DISABLE_GCC_WARNING(redundant-decls)
-#include <openssl/rsa.h>
-#include <openssl/bn.h>
-#include <openssl/pem.h>
-ENABLE_GCC_WARNING(redundant-decls)
-
 #ifdef _WIN32
 /* For mkdir() */
 #include <direct.h>
diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c
index 59d3be9..feba8f6 100644
--- a/src/test/test_rendcache.c
+++ b/src/test/test_rendcache.c
@@ -11,7 +11,6 @@
 #include "routerlist.h"
 #include "config.h"
 #include "hs_common.h"
-#include <openssl/rsa.h>
 #include "rend_test_helpers.h"
 #include "log_test_helpers.h"
 





More information about the tor-commits mailing list