X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/81344b40e3de597f60758926e5e1ae7a81dd5457..377da0430697e6bcb8c48744eb5af4272a8f8075:/src/src/deliver.c

diff --git a/src/src/deliver.c b/src/src/deliver.c
index b89671c57..58874add4 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -1610,6 +1610,7 @@ if (result == OK)
   tls_out.peercert = addr->peercert;
   addr->peercert = NULL;
 
+  tls_out.ver = addr->tlsver;
   tls_out.cipher = addr->cipher;
   tls_out.peerdn = addr->peerdn;
   tls_out.ocsp = addr->ocsp;
@@ -1623,6 +1624,7 @@ if (result == OK)
 #ifndef DISABLE_TLS
   tls_free_cert(&tls_out.ourcert);
   tls_free_cert(&tls_out.peercert);
+  tls_out.ver = NULL;
   tls_out.cipher = NULL;
   tls_out.peerdn = NULL;
   tls_out.ocsp = OCSP_NOT_REQ;
@@ -3480,11 +3482,13 @@ while (!done)
       switch (*subid)
 	{
 	case '1':
-	  addr->cipher = NULL;
-	  addr->peerdn = NULL;
+	  addr->tlsver = addr->cipher = addr->peerdn = NULL;
 
 	  if (*ptr)
+	    {
 	    addr->cipher = string_copy(ptr);
+	    addr->tlsver = string_copyn(ptr, Ustrchr(ptr, ':') - ptr);
+	    }
 	  while (*ptr++);
 	  if (*ptr)
 	    addr->peerdn = string_copy(ptr);