Add tls_verify_hosts and tls_try_verify_hosts to smtp transport. Bug 1371

Code by Wolfgang Breyha, docs and testsuite by Jeremy Harris

diff --cc doc/doc-docbook/spec.xfpt
Simple merge

diff --cc doc/doc-txt/ChangeLog
index 04a7ce02e69dbaf67653c123ea6d3548687caa92,c1640f73ad1e9202c59106ecaeef8e61581d77c5..c29f21cbf5f95691c924b37b09f926db9b8fd21f
--- 1/doc/doc-txt/ChangeLog
--- 2/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -32,30 -32,8 +32,32 @@@ JH/02 Add ${listextract {number}{list}{
  TL/03 Bugzilla 1433: Fix DMARC SEGV with specific From header contents.
        Properly escape header and check for NULL return.
  
 -JH/03 Add tls_{,try_}verify_hosts to smtp transport. OpenSSL only.
 +PP/01 Continue incomplete 4.82 PP/19 by fixing docs too: use dns_dnssec_ok
 +      not dns_use_dnssec.
 +
 +JH/03 Bugzilla 1157: support log_selector smtp_confirmation for lmtp.
 +
 +TL/04 Add verify = header_names_ascii check to reject email with non-ASCII
 +      characters in header names, implemented as a verify condition.
 +      Contributed by Michael Fischer v. Mollard.
 +
 +TL/05 Rename SPF condition results err_perm and err_temp to standardized
 +      results permerror and temperror. Is a backward incompatibility if
 +      the ACL tests for either of these two results. Patch contributed by
 +      user bes-internal on the mailing list.
 +
 +JH/04 Add ${utf8clean:} operator. Contributed by Alex Rau.
 +
 +JH/05 Bugzilla 305: Log incoming-TLS details on rejects, subject to log
 +      selectors, in both main and reject logs.
 +
 +JH/06 Log outbound-TLS and port details, subject to log selectors, for a
 +      failed delivery.
 +
 +JH/07 Add malware type "sock" for talking to simple daemon.
 +
++JH/08 Bugzilla 1371: Add tls_{,try_}verify_hosts to smtp transport. OpenSSL only.
+ 
  
  Exim version 4.82
  -----------------

diff --cc doc/doc-txt/NewStuff
index c4de902c000be4732b8bf6314ca8a75ccdb78172,e4f2e29a1bc1d4386082bcbce60e8658690d4363..95b4119d167c853800511cbec885af1ec755eb9b
--- 1/doc/doc-txt/NewStuff
--- 2/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@@ -14,19 -14,11 +14,24 @@@ Version 4.8
      actual external source IP:host be used in exim instead of the IP of the
      proxy that is connecting to it.
  
 - 2. When built with OpenSSL the smtp transport now supports options
 + 2. New verify option header_names_ascii, which will check to make sure
 +    there are no non-ASCII characters in header names.  Exim itself handles
 +    those non-ASCII characters, but downstream apps may not, so Exim can
 +    detect and reject if those characters are present.
 +
 + 3. New expansion operator ${utf8clean:string} to replace malformed UTF8
 +    codepoints with valid ones.
 +
 + 4. New malware type "sock".  Talks over a Unix or TCP socket, sending one
 +    command line and matching a regex against the return data for trigger
 +    and a second regex to extract malware_name.  The mail spoofile name can
 +    be included in the command line.
 +
++ 5. When built with OpenSSL the smtp transport now supports options
+     "tls_verify_hosts" and "tls_try_verify_hosts".  If either is set the
+     certificate verification is split from the encryption operation. The
+     default remains that a failed verification cancels the encryption.
+ 
  
  Version 4.82
  ------------

diff --cc src/src/functions.h
Simple merge

diff --cc src/src/verify.c
Simple merge