diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-09 08:25:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-09 08:25:52 -0400 |
| commit | 9df20f60762dbd21796bb8c9c621585662e7f708 (patch) | |
| tree | 7134a05ad3b9882787158033c571ca8dd5ecbd39 | |
| parent | e6d6347690d085dddb57d087a952750131b80758 (diff) | |
| parent | a639a67844909bd05fadaea5c1847f5e9af55cde (diff) | |
| download | tor-9df20f60762dbd21796bb8c9c621585662e7f708.tar.gz tor-9df20f60762dbd21796bb8c9c621585662e7f708.zip | |
Merge branch 'maint-0.3.3'
| -rw-r--r-- | changes/ticket26006 | 4 | ||||
| -rw-r--r-- | src/common/compat_openssl.h | 6 | ||||
| -rw-r--r-- | src/test/test_tortls.c | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/changes/ticket26006 b/changes/ticket26006 new file mode 100644 index 0000000000..e33e3f1cd2 --- /dev/null +++ b/changes/ticket26006 @@ -0,0 +1,4 @@ + o Minor features (compilation, portability): + - Avoid some compilation warnings with recent versions + of LibreSSL. Closes ticket 26006. + diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index 1299ac36bb..d1481fb46c 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -9,6 +9,7 @@ #include <openssl/opensslv.h> #include "crypto_openssl_mgt.h" + /** * \file compat_openssl.h * @@ -27,8 +28,11 @@ #define OPENSSL_1_1_API #endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */ -#ifndef OPENSSL_1_1_API +#ifndef OPENSSL_VERSION #define OPENSSL_VERSION SSLEAY_VERSION +#endif + +#ifndef OPENSSL_1_1_API #define OpenSSL_version(v) SSLeay_version(v) #define OpenSSL_version_num() SSLeay() #define RAND_OpenSSL() RAND_SSLeay() diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index ffa641ec41..896e093968 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -847,8 +847,10 @@ test_tortls_classify_client_ciphers(void *ignored) sk_SSL_CIPHER_zero(ciphers); one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); + tt_assert(one); one->id = 0x00ff; two = get_cipher_by_name("ECDHE-RSA-AES128-GCM-SHA256"); + tt_assert(two); two->id = 0x0000; sk_SSL_CIPHER_push(ciphers, one); tls->client_cipher_list_type = 0; @@ -918,6 +920,7 @@ test_tortls_client_is_using_v2_ciphers(void *ignored) ciphers = sk_SSL_CIPHER_new_null(); SSL_CIPHER *one = get_cipher_by_name("ECDHE-RSA-AES256-GCM-SHA384"); + tt_assert(one); one->id = 0x00ff; sk_SSL_CIPHER_push(ciphers, one); sess->ciphers = ciphers; |