git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0106796
)
Fix OpenSSL non-OCSP build
author
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 16 Apr 2018 17:45:04 +0000
(18:45 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 16 Apr 2018 17:45:04 +0000
(18:45 +0100)
src/src/tls-openssl.c
patch
|
blob
|
history
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index fb59217da87031de1a4ebabe0cf4f6baaeaeff2f..cefa94fecb1526ed94999ca2674ae0b3499b0fdf 100644
(file)
--- a/
src/src/tls-openssl.c
+++ b/
src/src/tls-openssl.c
@@
-2505,10
+2505,12
@@
if (error == SSL_ERROR_ZERO_RETURN)
if (SSL_get_shutdown(server_ssl) == SSL_RECEIVED_SHUTDOWN)
SSL_shutdown(server_ssl);
if (SSL_get_shutdown(server_ssl) == SSL_RECEIVED_SHUTDOWN)
SSL_shutdown(server_ssl);
+#ifndef DISABLE_OCSP
sk_X509_pop_free(server_static_cbinfo->verify_stack, X509_free);
sk_X509_pop_free(server_static_cbinfo->verify_stack, X509_free);
+ server_static_cbinfo->verify_stack = NULL;
+#endif
SSL_free(server_ssl);
SSL_CTX_free(server_ctx);
SSL_free(server_ssl);
SSL_CTX_free(server_ctx);
- server_static_cbinfo->verify_stack = NULL;
server_ctx = NULL;
server_ssl = NULL;
tls_in.active = -1;
server_ctx = NULL;
server_ssl = NULL;
tls_in.active = -1;
@@
-2782,11
+2784,13
@@
if (shutdown)
}
}
}
}
+#ifndef DISABLE_OCSP
if (is_server)
{
sk_X509_pop_free(server_static_cbinfo->verify_stack, X509_free);
server_static_cbinfo->verify_stack = NULL;
}
if (is_server)
{
sk_X509_pop_free(server_static_cbinfo->verify_stack, X509_free);
server_static_cbinfo->verify_stack = NULL;
}
+#endif
SSL_CTX_free(*ctxp);
SSL_free(*sslp);
SSL_CTX_free(*ctxp);
SSL_free(*sslp);