nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

LibreSSL compatibility fixes.

Browse Source 
LibreSSL, despite not having the OpenSSL 1.1 API, does define
OPENSSL_VERSION in crypto.h.  Additionally, it apparently annotates
some functions as returning NULL, so that our unit tests need to be
more careful about checking for NULL so they don't get compilation
warnings.

Closes ticket 26006.
This commit is contained in:
Nick Mathewson 2018-05-02 08:18:48 -04:00
parent 34e7dca9c9
commit 75f3fbaa3c
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket26006 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (compilation, portability):
- Avoid some compilation warnings with recent versions
of LibreSSL. Closes ticket 26006.

7
src/common/compat_openssl.h
View File

@ -8,6 +8,8 @@
#define TOR_COMPAT_OPENSSL_H #define TOR_COMPAT_OPENSSL_H
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
// workaround for libressl; not needed in later Tor versions.
#include <openssl/crypto.h>
/** /**
* \file compat_openssl.h * \file compat_openssl.h
@ -27,8 +29,11 @@
#define OPENSSL_1_1_API #define OPENSSL_1_1_API
#endif #endif
#ifndef OPENSSL_1_1_API #ifndef OPENSSL_VERSION
#define OPENSSL_VERSION SSLEAY_VERSION #define OPENSSL_VERSION SSLEAY_VERSION
#endif
#ifndef OPENSSL_1_1_API
#define OpenSSL_version(v) SSLeay_version(v) #define OpenSSL_version(v) SSLeay_version(v)
#define OpenSSL_version_num() SSLeay() #define OpenSSL_version_num() SSLeay()
#define RAND_OpenSSL() RAND_SSLeay() #define RAND_OpenSSL() RAND_SSLeay()

3
src/test/test_tortls.c
View File

@ -840,8 +840,10 @@ test_tortls_classify_client_ciphers(void *ignored)
sk_SSL_CIPHER_zero(ciphers); sk_SSL_CIPHER_zero(ciphers);
one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384");
tt_assert(one);
one->id = 0x00ff; one->id = 0x00ff;
two = get_cipher_by_name("ECDHE-RSA-AES128-GCM-SHA256"); two = get_cipher_by_name("ECDHE-RSA-AES128-GCM-SHA256");
tt_assert(two);
two->id = 0x0000; two->id = 0x0000;
sk_SSL_CIPHER_push(ciphers, one); sk_SSL_CIPHER_push(ciphers, one);
tls->client_cipher_list_type = 0; tls->client_cipher_list_type = 0;
@ -912,6 +914,7 @@ test_tortls_client_is_using_v2_ciphers(void *ignored)
ciphers = sk_SSL_CIPHER_new_null(); ciphers = sk_SSL_CIPHER_new_null();
SSL_CIPHER *one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); SSL_CIPHER *one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384");
tt_assert(one);
one->id = 0x00ff; one->id = 0x00ff;
sk_SSL_CIPHER_push(ciphers, one); sk_SSL_CIPHER_push(ciphers, one);
sess->ciphers = ciphers; sess->ciphers = ciphers;