tls_require_ciphers must be assigned to state copy

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 21f1ec747a5c0554cd55437ce19b7ae812f7eddd..3d0f5c255038f2eea23aabc8425cf53266482bda 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -134,6 +134,9 @@ PP/31 %D in printf continues to cause issues (-Wformat=security), so for
       As part of this, removing so much warning spew let me fix some minor
       real issues in debug logging.
 
       As part of this, removing so much warning spew let me fix some minor
       real issues in debug logging.
 

+PP/32 GnuTLS was always using default tls_require_ciphers, due to a missing
+      assignment on my part.  Fixed.
+

 
 Exim version 4.77
 -----------------
 
 Exim version 4.77
 -----------------

diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 51fdb86574d30507be67d2fac0f5841f17213edc..9d121f96fbe91c36a77babb51b6062e6b3ca7b0f 100644 (file)
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -870,6 +870,7 @@ state->host = host;
 
 state->tls_certificate = certificate;
 state->tls_privatekey = privatekey;
 
 state->tls_certificate = certificate;
 state->tls_privatekey = privatekey;

+state->tls_require_ciphers = require_ciphers;

 state->tls_sni = sni;
 state->tls_verify_certificates = cas;
 state->tls_crl = crl;
 state->tls_sni = sni;
 state->tls_verify_certificates = cas;
 state->tls_crl = crl;