Commit a639a678 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'libressl_201805_033' into maint-0.3.3

parents b979415e bf3e899d

changes/ticket26006

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor features (compilation, portability):

    - Avoid some compilation warnings with recent versions

      of LibreSSL. Closes ticket 26006.

src/common/compat_openssl.h

+5 −1
Original line number Diff line number Diff line
@@ -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()

src/test/test_tortls.c

+3 −0
Original line number Diff line number Diff line
@@ -841,8 +841,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;
@@ -913,6 +915,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;