Add OpenSSL version check

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 05af3db884736e1af76039f1eab6a2464a2fa2c4..bcca506e0011c034ce689bc550b22397f25b6fc6 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -35,6 +35,11 @@ functions from the OpenSSL library. */
 # define EXIM_HAVE_OPENSSL_TLSEXT
 #endif
 
+#if !defined(EXIM_HAVE_OPENSSL_TLSEXT) && !defined(DISABLE_OCSP)
+# warning "OpenSSL library version too old; define DISABLE_OCSP in Makefile"
+# define DISABLE_OCSP
+#endif
+
 /* Structure for collecting random data for seeding. */
 
 typedef struct randstuff {

diff --git a/src/src/tls.c b/src/src/tls.c
index cb7efffe9b4ccff06fcd386e28f6707e3f908c8c..f2ab56706201a8bbc267ea0a031b71366438604a 100644 (file)
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -313,10 +313,9 @@ if ((altnames = tls_cert_subject_altname(cert, US"dns")))
 else if ((subjdn = tls_cert_subject(cert, NULL)))
   {
   int sn_sep = ',';
-  uschar * sn;
 
   dn_to_list(subjdn);
-  while (cmpname = string_nextinlist(&namelist, &cmp_sep, NULL, 0))
+  while ((cmpname = string_nextinlist(&namelist, &cmp_sep, NULL, 0)))
     {
     uschar * sn = subjdn;
     while ((certname = string_nextinlist(&sn, &sn_sep, NULL, 0)))