[exim-cvs] Fix OpenSSL non-OCSP build

Top Page
Delete this message
Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Fix OpenSSL non-OCSP build
Gitweb: https://git.exim.org/exim.git/commitdiff/37f0ce65959019e417ff79b9d0959e13470c5290
Commit:     37f0ce65959019e417ff79b9d0959e13470c5290
Parent:     010679682b6a32c00f61a3b2f067692f6be83a3c
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Apr 16 18:45:04 2018 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Apr 16 18:45:04 2018 +0100


    Fix OpenSSL non-OCSP build
---
 src/src/tls-openssl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index fb59217..cefa94f 100644
--- 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);


+#ifndef DISABLE_OCSP
   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);
-  server_static_cbinfo->verify_stack = NULL;
   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;
}
+#endif

SSL_CTX_free(*ctxp);
SSL_free(*sslp);