src/openssl.c: Prefer our list of standard cipher names in openssl <1.1.1

daurnimator · daurnimator · commit 2ec9b9360059 · 2018-07-13T18:55:35.000+10:00
diff --git a/src/openssl.c b/src/openssl.c
@@ -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"},

Original file line number	Diff line number	Diff line change
`@@ -1789,7 +1789,8 @@ static size_t compat_SSL_SESSION_get_master_key(const SSL_SESSION *session, unsi`
`1789`	`1789`	`}`
`1790`	`1790`	`#endif`
`1791`	`1791`
`1792`		`-#if !HAVE_SSL_CIPHER_STANDARD_NAME`
	`1792`	`+#if !HAVE_SSL_CIPHER_STANDARD_NAME \|\| !OPENSSL_PREREQ(1,1,1)`
	`1793`	`+/* OpenSSL < 1.1.1 has some outdated names; prefer this list */`
`1793`	`1794`	`static const struct {int num; const char *name;} ssl_ciphers_tbl[] = {`
`1794`	`1795`	`{0x0000, "TLS_NULL_WITH_NULL_NULL"},`
`1795`	`1796`	`{0x0001, "TLS_RSA_WITH_NULL_MD5"},`