diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-04-29 08:51:01 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-04-29 08:51:03 -0400 |
| commit | 5873e9a3e83361c7e4654a7b5d623d75298996e8 (patch) | |
| tree | 4a7195b666fbb942087cbf29383eab161a245618 | |
| parent | 11e32e2fd1b1c4dd9fad9b4af7288f32522f4794 (diff) | |
| parent | a34081b7c398847c37a587029c7ad7f3a3396c8e (diff) | |
Merge #15919: Remove unused OpenSSL includes to make it more clear where OpenSSL is used
a34081b7c3 Remove unused OpenSSL includes to make it more clear where OpenSSL is used (practicalswift)
Pull request description:
Remove unused OpenSSL includes to make it more clear where OpenSSL is used.
Before this patch:
```
$ git grep '#include <openssl/' -- "*.cpp" "*.h"
src/init.cpp:#include <openssl/crypto.h>
src/qt/paymentrequestplus.cpp:#include <openssl/x509_vfy.h>
src/qt/paymentrequestplus.h:#include <openssl/x509.h>
src/qt/paymentserver.cpp:#include <openssl/x509_vfy.h>
src/qt/rpcconsole.cpp:#include <openssl/crypto.h>
src/qt/test/paymentservertests.cpp:#include <openssl/x509.h>
src/qt/test/paymentservertests.cpp:#include <openssl/x509_vfy.h>
src/qt/test/test_main.cpp:#include <openssl/ssl.h>
src/qt/winshutdownmonitor.cpp:#include <openssl/rand.h>
src/random.cpp:#include <openssl/err.h>
src/random.cpp:#include <openssl/rand.h>
src/random.cpp:#include <openssl/conf.h>
src/test/crypto_tests.cpp:#include <openssl/aes.h>
src/test/crypto_tests.cpp:#include <openssl/evp.h>
```
After this patch:
```
$ git grep '#include <openssl/' -- "*.cpp" "*.h"
src/qt/paymentrequestplus.cpp:#include <openssl/x509_vfy.h>
src/qt/paymentrequestplus.h:#include <openssl/x509.h>
src/qt/paymentserver.cpp:#include <openssl/x509_vfy.h>
src/qt/test/paymentservertests.cpp:#include <openssl/x509.h>
src/qt/test/paymentservertests.cpp:#include <openssl/x509_vfy.h>
src/qt/test/test_main.cpp:#include <openssl/ssl.h>
src/qt/winshutdownmonitor.cpp:#include <openssl/rand.h>
src/random.cpp:#include <openssl/err.h>
src/random.cpp:#include <openssl/rand.h>
src/random.cpp:#include <openssl/conf.h>
```
Removed:
* `src/init.cpp:#include <openssl/crypto.h>` (unused since 5ecfa36fd01fc27475abbfcd53b4efb9da4a7398 (2016))
* `src/qt/rpcconsole.cpp:#include <openssl/crypto.h>` (unused since 5ecfa36fd01fc27475abbfcd53b4efb9da4a7398 (2016))
* `src/test/crypto_tests.cpp:#include <openssl/aes.h>` (introduced unused in daa384120a63542257d4ca73047d775f16fac654 (2015))
* `src/test/crypto_tests.cpp:#include <openssl/evp.h>` (introduced unused in daa384120a63542257d4ca73047d775f16fac654 (2015))
ACKs for commit a34081:
MarcoFalke:
utACK a34081b7c398847c37a587029c7ad7f3a3396c8e
real-or-random:
utACK a34081b
fanquake:
utACK a34081b
Tree-SHA512: 8ab9699c063f2d0ed2d71738f20ac5c21336585f7f62fd3a4b23199a125ea3224725591d64171347465762181788fac1bc4ce13d8824090bf1a5ac71a66d6538
| -rw-r--r-- | src/init.cpp | 1 | ||||
| -rw-r--r-- | src/qt/rpcconsole.cpp | 2 | ||||
| -rw-r--r-- | src/test/crypto_tests.cpp | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp index 29c9694213..7b7456db1d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -66,7 +66,6 @@ #include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/split.hpp> #include <boost/thread.hpp> -#include <openssl/crypto.h> #if ENABLE_ZMQ #include <zmq/zmqabstractnotifier.h> diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index c7ced3c106..8b6dcf0445 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -21,8 +21,6 @@ #include <util/strencodings.h> #include <util/system.h> -#include <openssl/crypto.h> - #include <univalue.h> #ifdef ENABLE_WALLET diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp index 8a219a8284..0d05b6514f 100644 --- a/src/test/crypto_tests.cpp +++ b/src/test/crypto_tests.cpp @@ -18,8 +18,6 @@ #include <vector> #include <boost/test/unit_test.hpp> -#include <openssl/aes.h> -#include <openssl/evp.h> BOOST_FIXTURE_TEST_SUITE(crypto_tests, BasicTestingSetup) |