torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Generate error ASAP if building with too-old openssl

Browse Source
This commit is contained in:
Nick Mathewson
2015-05-21 11:54:13 -04:00
parent a35d22479b
commit 0b7bf3585a
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/aes.c
+6 -1
View File
@@ -25,13 +25,18 @@
#endif
#include <openssl/opensslv.h>
#include "crypto.h"
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
#error "We require OpenSSL >= 1.0.0"
#endif
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <openssl/aes.h>
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "crypto.h"
#include <openssl/modes.h>
#include "compat.h"
#include "aes.h"
src/common/crypto.c
+9 -7
View File
@@ -24,13 +24,21 @@
#undef OCSP_RESPONSE
#endif
#include <openssl/opensslv.h>
#define CRYPTO_PRIVATE
#include "crypto.h"
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
#error "We require OpenSSL >= 1.0.0"
#endif
#include <openssl/err.h>
#include <openssl/rsa.h>
#include <openssl/pem.h>
#include <openssl/evp.h>
#include <openssl/engine.h>
#include <openssl/rand.h>
#include <openssl/opensslv.h>
#include <openssl/bn.h>
#include <openssl/dh.h>
#include <openssl/conf.h>
@@ -49,8 +57,6 @@
#include <sys/fcntl.h>
#endif
#define CRYPTO_PRIVATE
#include "crypto.h"
#include "torlog.h"
#include "aes.h"
#include "util.h"
@@ -58,10 +64,6 @@
#include "compat.h"
#include "sandbox.h"
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
#error "We require OpenSSL >= 1.0.0"
#endif
#ifdef ANDROID
/* Android's OpenSSL seems to have removed all of its Engine support. */
#define DISABLE_ENGINES
src/common/tortls.c
+7 -6
View File
@@ -43,13 +43,19 @@
#pragma GCC diagnostic ignored "-Wredundant-decls"
#endif
#include <openssl/opensslv.h>
#include "crypto.h"
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
#error "We require OpenSSL >= 1.0.0"
#endif
#include <openssl/ssl.h>
#include <openssl/ssl3.h>
#include <openssl/err.h>
#include <openssl/tls1.h>
#include <openssl/asn1.h>
#include <openssl/bio.h>
#include <openssl/opensslv.h>
#include <openssl/bn.h>
#include <openssl/rsa.h>
@@ -68,17 +74,12 @@
#include "compat_libevent.h"
#endif
#include "crypto.h"
#include "tortls.h"
#include "util.h"
#include "torlog.h"
#include "container.h"
#include <string.h>
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
#error "We require OpenSSL >= 1.0.0"
#endif
/* Enable the "v2" TLS handshake.
*/
#define V2_HANDSHAKE_SERVER