Skip to content

Commit

Permalink
src/openssl.c: Prefer our list of standard cipher names in openssl <1…
Browse files Browse the repository at this point in the history
….1.1
  • Loading branch information
daurnimator committed Jul 13, 2018
1 parent 2d01cf6 commit 2ec9b93
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/openssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1789,7 +1789,8 @@ static size_t compat_SSL_SESSION_get_master_key(const SSL_SESSION *session, unsi
}
#endif

#if !HAVE_SSL_CIPHER_STANDARD_NAME
#if !HAVE_SSL_CIPHER_STANDARD_NAME || !OPENSSL_PREREQ(1,1,1)
/* OpenSSL < 1.1.1 has some outdated names; prefer this list */
static const struct {int num; const char *name;} ssl_ciphers_tbl[] = {
{0x0000, "TLS_NULL_WITH_NULL_NULL"},
{0x0001, "TLS_RSA_WITH_NULL_MD5"},
Expand Down

0 comments on commit 2ec9b93

Please sign in to comment.