summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2021-07-23 12:05:49 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2021-07-23 12:05:49 +0100
commit27d03dca10d1d7247b7e006afc27bcb1e2c0e516 (patch)
tree427b72b2a6348ae4dce332442d3db5ae91de8504
parentdbbc1c20b59dc10368e31a7c81f110eb40b36494 (diff)
downloadexim4-27d03dca10d1d7247b7e006afc27bcb1e2c0e516.tar.gz
DKIM: fix build with older GnuTLS
-rw-r--r--src/src/pdkim/signing.c4
-rwxr-xr-xtest/runtest1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c
index d818fc9df..5f24e8030 100644
--- a/src/src/pdkim/signing.c
+++ b/src/src/pdkim/signing.c
@@ -37,6 +37,10 @@ features_crypto(void)
#ifdef SIGN_GNUTLS
# define EXIM_GNUTLS_LIBRARY_LOG_LEVEL 3
+# ifndef GNUTLS_VERIFY_ALLOW_BROKEN
+# define GNUTLS_VERIFY_ALLOW_BROKEN 0
+# endif
+
/* Logging function which can be registered with
* gnutls_global_set_log_function()
diff --git a/test/runtest b/test/runtest
index 9bde9046f..f595634e9 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1097,6 +1097,7 @@ RESET_AFTER_EXTRA_LINE_READ:
next if /^GnuTLS<2>: (Disabling X.509 extensions|signing structure using RSA-SHA256)/;
next if /^GnuTLS.*(wrap_nettle_mpi_print|gnutls_subject_alt_names_get|get_alt_name)/;
next if /^GnuTLS<[23]>: (p11|ASSERT: pkcs11.c|Initializing needed PKCS #11 modules)/;
+ next if /^GnuTLS<2>: Intel (AES|GCM) accelerator was detected/;
next if /^Added \d{3} certificate authorities/;
next if /^TLS: not preloading CRL for server/;