Skip to content

Conversation

@practicalswift
Copy link
Contributor

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 5ecfa36 (2016))
  • src/qt/rpcconsole.cpp:#include <openssl/crypto.h> (unused since 5ecfa36 (2016))
  • src/test/crypto_tests.cpp:#include <openssl/aes.h> (introduced unused in daa3841 (2015))
  • src/test/crypto_tests.cpp:#include <openssl/evp.h> (introduced unused in daa3841 (2015))

@maflcko
Copy link
Member

maflcko commented Apr 29, 2019

utACK a34081b

@real-or-random
Copy link
Contributor

utACK a34081b

1 similar comment
@fanquake
Copy link
Member

utACK a34081b

@maflcko maflcko merged commit a34081b into bitcoin:master Apr 29, 2019
maflcko pushed a commit that referenced this pull request Apr 29, 2019
…ere OpenSSL is used

a34081b 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 5ecfa36 (2016))
  * `src/qt/rpcconsole.cpp:#include <openssl/crypto.h>` (unused since 5ecfa36 (2016))
  * `src/test/crypto_tests.cpp:#include <openssl/aes.h>` (introduced unused in daa3841 (2015))
  * `src/test/crypto_tests.cpp:#include <openssl/evp.h>` (introduced unused in daa3841 (2015))

ACKs for commit a34081:
  MarcoFalke:
    utACK a34081b
  real-or-random:
    utACK a34081b
  fanquake:
    utACK a34081b

Tree-SHA512: 8ab9699c063f2d0ed2d71738f20ac5c21336585f7f62fd3a4b23199a125ea3224725591d64171347465762181788fac1bc4ce13d8824090bf1a5ac71a66d6538
@scravy
Copy link
Contributor

scravy commented Apr 30, 2019

utACK a34081b

deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Oct 1, 2020
… used

Summary: Backport of core [[bitcoin/bitcoin#15919 | PR15919]].

Test Plan:
  ninja check

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D7700
@practicalswift practicalswift deleted the openssl-includes branch April 10, 2021 19:38
vijaydasmp pushed a commit to vijaydasmp/dash that referenced this pull request Nov 21, 2021
…t more clear where OpenSSL is used

a34081b 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 5ecfa36 (2016))
  * `src/qt/rpcconsole.cpp:#include <openssl/crypto.h>` (unused since 5ecfa36 (2016))
  * `src/test/crypto_tests.cpp:#include <openssl/aes.h>` (introduced unused in daa3841 (2015))
  * `src/test/crypto_tests.cpp:#include <openssl/evp.h>` (introduced unused in daa3841 (2015))

ACKs for commit a34081:
  MarcoFalke:
    utACK a34081b
  real-or-random:
    utACK a34081b
  fanquake:
    utACK a34081b

Tree-SHA512: 8ab9699c063f2d0ed2d71738f20ac5c21336585f7f62fd3a4b23199a125ea3224725591d64171347465762181788fac1bc4ce13d8824090bf1a5ac71a66d6538
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants