[tor-commits] [tor/release-0.4.4] Include a more modest openssl header in crypto_openssl_mgt.h

[dgoulet@xxxxxxxxxxxxxx]

commit d9221968ce3daed75d698f333f8bea0bf742ddf3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Oct 28 10:07:56 2020 -0400

    Include a more modest openssl header in crypto_openssl_mgt.h
    
    The "engines.h" header has lots of stuff; the "opensslv.h" header
    has the version number, which is all we actually need here.
    
    We need to do this because we're about to change this header to
    conditionally define OPENSSL_SUPPRESS_DEPRECATED, and it would be
    too late to do so if we'd already included "engines.h".
---
 src/lib/crypt_ops/crypto_openssl_mgt.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.h b/src/lib/crypt_ops/crypto_openssl_mgt.h
index a3dd03aa04..8dbadfc9d2 100644
--- a/src/lib/crypt_ops/crypto_openssl_mgt.h
+++ b/src/lib/crypt_ops/crypto_openssl_mgt.h
@@ -16,8 +16,7 @@
 #include "orconfig.h"
 
 #ifdef ENABLE_OPENSSL
-#include <openssl/engine.h>
-
+#include <openssl/opensslv.h>
 /*
   Macro to create an arbitrary OpenSSL version number as used by
   OPENSSL_VERSION_NUMBER or SSLeay(), since the actual numbers are a bit hard



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits