blob: b1028c5d739c82ac2f8e3e9be781809cc58a6010 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
Index: src/tls/tls_misc.c
--- src/tls/tls_misc.c.orig
+++ src/tls/tls_misc.c
@@ -657,7 +657,7 @@ void tls_param_init(void)
int tls_library_init(void)
{
- OPENSSL_INIT_SETTINGS *init_settings;
+ // OPENSSL_INIT_SETTINGS *init_settings;
char *conf_name = *var_tls_cnf_name ? var_tls_cnf_name : 0;
char *conf_file = 0;
unsigned long init_opts = 0;
@@ -681,6 +681,7 @@ int tls_library_init(void)
msg_info("tls_library_init: using backwards-compatible defaults");
return (init_res = TLS_LIB_INIT_OK);
}
+#if 0
if ((init_settings = OPENSSL_INIT_new()) == 0) {
msg_warn("error allocating OpenSSL init settings, "
"disabling TLS support");
@@ -763,6 +764,8 @@ int tls_library_init(void)
TLS_LIB_INIT_RETURN(TLS_LIB_INIT_ERR);
}
TLS_LIB_INIT_RETURN(TLS_LIB_INIT_OK);
+#endif
+ return init_res = TLS_LIB_INIT_OK;
}
/* tls_pre_jail_init - Load TLS related pre-jail tables */
@@ -1644,6 +1647,7 @@ int tls_validate_digest(const char *dgst)
* Improves interoperability with clients and servers that prematurely
* deploy SHA-2 certificates. Also facilitates DANE and TA support.
*/
+#ifndef LIBRESSL_VERSION_NUMBER
#if defined(LN_sha256) && defined(NID_sha256) && !defined(OPENSSL_NO_SHA256)
if (!tls_digest_byname(LN_sha224, NULL))
EVP_add_digest(EVP_sha224());
@@ -1655,6 +1659,7 @@ int tls_validate_digest(const char *dgst)
EVP_add_digest(EVP_sha384());
if (!tls_digest_byname(LN_sha512, NULL))
EVP_add_digest(EVP_sha512());
+#endif
#endif
/*
|
