Merge remote-tracking branch 'ffmancera/bug24658-openssl'

diff --cc src/common/aes.c
Simple merge

diff --cc src/common/crypto.c
index b519caed07b71ea51ae644ef338354308b1970a0,3fba2da5d9f7792e7724cfd0ba83a1d2181f86a9..3ff3a98e0dbf8fec73bceca23a4f6719a97f3afc
--- 1/src/common/crypto.c
--- 2/src/common/crypto.c
+++ b/src/common/crypto.c
@@@ -3494,14 -3363,7 +3366,13 @@@ crypto_global_cleanup(void
    }
  #endif /* !defined(NEW_THREAD_API) */
  
-   tor_free(crypto_openssl_version_str);
-   tor_free(crypto_openssl_header_version_str);
+   crypto_openssl_free_all();
 +
 +  crypto_early_initialized_ = 0;
 +  crypto_global_initialized_ = 0;
 +  have_seeded_siphash = 0;
 +  siphash_unset_global_key();
 +
    return 0;
  }
  

diff --cc src/common/crypto.h
index eca115fa799a14428e9a84de551a03ebd919e03f,879af45fec02425226753468d6e2f78c71f9d3ce..3caa23773d9989113875b32745765707bec8bafa
--- 1/src/common/crypto.h
--- 2/src/common/crypto.h
+++ b/src/common/crypto.h
@@@ -19,43 -19,9 +19,10 @@@
  #include "torint.h"
  #include "testsupport.h"
  #include "compat.h"
 +#include "util.h"
  
- #include <openssl/engine.h>
  #include "keccak-tiny/keccak-tiny.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
-   to read.
- 
-   Don't use this directly, instead use one of the other OPENSSL_V macros
-   below.
- 
-   The format is: 4 bits major, 8 bits minor, 8 bits fix, 8 bits patch, 4 bit
-   status.
-  */
- #define OPENSSL_VER(a,b,c,d,e)                                \
-   (((a)<<28) |                                                \
-    ((b)<<20) |                                                \
-    ((c)<<12) |                                                \
-    ((d)<< 4) |                                                \
-     (e))
- /** An openssl release number.  For example, OPENSSL_V(0,9,8,'j') is the
-  * version for the released version of 0.9.8j */
- #define OPENSSL_V(a,b,c,d) \
-   OPENSSL_VER((a),(b),(c),(d)-'a'+1,0xf)
- /** An openssl release number for the first release in the series.  For
-  * example, OPENSSL_V_NOPATCH(1,0,0) is the first released version of OpenSSL
-  * 1.0.0. */
- #define OPENSSL_V_NOPATCH(a,b,c) \
-   OPENSSL_VER((a),(b),(c),0,0xf)
- /** The first version that would occur for any alpha or beta in an openssl
-  * series. For example, OPENSSL_V_SERIES(0,9,8) is greater than any released
-  * 0.9.7, and less than any released 0.9.8. */
- #define OPENSSL_V_SERIES(a,b,c) \
-   OPENSSL_VER((a),(b),(c),0,0)
- 
  /** Length of the output of our message digest. */
  #define DIGEST_LEN 20
  /** Length of the output of our second (improved) message digests.  (For now

diff --cc src/common/include.am
Simple merge