git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6bf0021
)
Fix LibreSSL build
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 27 Nov 2022 11:29:40 +0000
(11:29 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 27 Nov 2022 11:29:40 +0000
(11:29 +0000)
src/src/tls-openssl.c
patch
|
blob
|
history
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index e673cb9f97d8682a67e8e51225cc7767b9a66726..8ed413e91e287614bfb4ed0bec15aad59c280b24 100644
(file)
--- a/
src/src/tls-openssl.c
+++ b/
src/src/tls-openssl.c
@@
-47,7
+47,6
@@
functions from the OpenSSL library. */
#endif
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
# define EXIM_HAVE_OCSP_RESP_COUNT
#endif
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
# define EXIM_HAVE_OCSP_RESP_COUNT
-# define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN
# define OPENSSL_AUTO_SHA256
# define OPENSSL_MIN_PROTO_VERSION
#else
# define OPENSSL_AUTO_SHA256
# define OPENSSL_MIN_PROTO_VERSION
#else
@@
-80,6
+79,7
@@
change this guard and punt the issue for a while longer. */
# define EXIM_HAVE_OPESSL_TRACE
# define EXIM_HAVE_OPESSL_GET0_SERIAL
# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS
# define EXIM_HAVE_OPESSL_TRACE
# define EXIM_HAVE_OPESSL_GET0_SERIAL
# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS
+# define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN
# ifndef DISABLE_OCSP
# define EXIM_HAVE_OCSP
# endif
# ifndef DISABLE_OCSP
# define EXIM_HAVE_OCSP
# endif
@@
-2232,7
+2232,7
@@
if (lib_ctx_new(&server_sni, NULL, &dummy_errstr) != OK)
/* Not sure how many of these are actually needed, since SSL object
already exists. Might even need this selfsame callback, for reneg? */
/* Not sure how many of these are actually needed, since SSL object
already exists. Might even need this selfsame callback, for reneg? */
-
{
+ {
SSL_CTX * ctx = state_server.lib_state.lib_ctx;
SSL_CTX_set_info_callback(server_sni, SSL_CTX_get_info_callback(ctx));
SSL_CTX_set_mode(server_sni, SSL_CTX_get_mode(ctx));
SSL_CTX * ctx = state_server.lib_state.lib_ctx;
SSL_CTX_set_info_callback(server_sni, SSL_CTX_get_info_callback(ctx));
SSL_CTX_set_mode(server_sni, SSL_CTX_get_mode(ctx));
@@
-2244,7
+2244,7
@@
already exists. Might even need this selfsame callback, for reneg? */
SSL_CTX_set_timeout(server_sni, SSL_CTX_get_timeout(ctx));
SSL_CTX_set_tlsext_servername_callback(server_sni, tls_servername_cb);
SSL_CTX_set_tlsext_servername_arg(server_sni, state);
SSL_CTX_set_timeout(server_sni, SSL_CTX_get_timeout(ctx));
SSL_CTX_set_tlsext_servername_callback(server_sni, tls_servername_cb);
SSL_CTX_set_tlsext_servername_arg(server_sni, state);
-
}
+ }
if ( !init_dh(server_sni, state->dhparam, &dummy_errstr)
|| !init_ecdh(server_sni, &dummy_errstr)
if ( !init_dh(server_sni, state->dhparam, &dummy_errstr)
|| !init_ecdh(server_sni, &dummy_errstr)