OpenSSL: Fix aggregation of messages.

[user/henk/code/exim.git] / src / src / tls-openssl.c

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index d37c789704336c119e09a62b76bec61c3c588a00..5a5e1464ba5665d7518e251c320764fb99f35505 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -289,6 +289,7 @@ Server:
 typedef struct {
   SSL_CTX *    ctx;
   SSL *                ssl;
 typedef struct {
   SSL_CTX *    ctx;
   SSL *                ssl;

+  gstring *    corked;

 } exim_openssl_client_tls_ctx;
 
 static SSL_CTX *server_ctx = NULL;
 } exim_openssl_client_tls_ctx;
 
 static SSL_CTX *server_ctx = NULL;


@@ -2523,6 +2524,7 @@ BOOL require_ocsp = FALSE;
 rc = store_pool;
 store_pool = POOL_PERM;
 exim_client_ctx = store_get(sizeof(exim_openssl_client_tls_ctx));
 rc = store_pool;
 store_pool = POOL_PERM;
 exim_client_ctx = store_get(sizeof(exim_openssl_client_tls_ctx));

+exim_client_ctx->corked = NULL;

 store_pool = rc;
 
 #ifdef SUPPORT_DANE
 store_pool = rc;
 
 #ifdef SUPPORT_DANE


@@ -2979,8 +2981,12 @@ tls_write(void * ct_ctx, const uschar *buff, size_t len, BOOL more)
 {
 size_t olen = len;
 int outbytes, error;
 {
 size_t olen = len;
 int outbytes, error;

-SSL * ssl = ct_ctx ? ((exim_openssl_client_tls_ctx *)ct_ctx)->ssl : server_ssl;
-static gstring * corked = NULL;
+SSL * ssl = ct_ctx
+  ? ((exim_openssl_client_tls_ctx *)ct_ctx)->ssl : server_ssl;
+static gstring * server_corked = NULL;
+gstring ** corkedp = ct_ctx
+  ? &((exim_openssl_client_tls_ctx *)ct_ctx)->corked : &server_corked;
+gstring * corked = *corkedp;

 
 DEBUG(D_tls) debug_printf("%s(%p, %lu%s)\n", __FUNCTION__,
   buff, (unsigned long)len, more ? ", more" : "");
 
 DEBUG(D_tls) debug_printf("%s(%p, %lu%s)\n", __FUNCTION__,
   buff, (unsigned long)len, more ? ", more" : "");


@@ -2988,7 +2994,9 @@ DEBUG(D_tls) debug_printf("%s(%p, %lu%s)\n", __FUNCTION__,
 /* Lacking a CORK or MSG_MORE facility (such as GnuTLS has) we copy data when
 "more" is notified.  This hack is only ok if small amounts are involved AND only
 one stream does it, in one context (i.e. no store reset).  Currently it is used
 /* Lacking a CORK or MSG_MORE facility (such as GnuTLS has) we copy data when
 "more" is notified.  This hack is only ok if small amounts are involved AND only
 one stream does it, in one context (i.e. no store reset).  Currently it is used

-for the responses to the received SMTP MAIL , RCPT, DATA sequence, only. */
+for the responses to the received SMTP MAIL , RCPT, DATA sequence, only.
+We support callouts done by the server process by using a separate client
+context for the stashed information. */

 /* + if PIPE_COMMAND, banner & ehlo-resp for smmtp-on-connect. Suspect there's
 a store reset there, so use POOL_PERM. */
 /* + if CHUNKING, cmds EHLO,MAIL,RCPT(s),BDAT */
 /* + if PIPE_COMMAND, banner & ehlo-resp for smmtp-on-connect. Suspect there's
 a store reset there, so use POOL_PERM. */
 /* + if CHUNKING, cmds EHLO,MAIL,RCPT(s),BDAT */


@@ -3007,10 +3015,13 @@ if ((more || corked))
 #endif
 
   if (more)
 #endif
 
   if (more)

+    {
+    *corkedp = corked;

     return len;
     return len;

+    }

   buff = CUS corked->s;
   len = corked->ptr;
   buff = CUS corked->s;
   len = corked->ptr;

-  corked = NULL;
+  *corkedp = NULL;

   }
 
 for (int left = len; left > 0;)
   }
 
 for (int left = len; left > 0;)