tidying

[users/jgh/exim.git] / src / src / tls-openssl.c

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 242394f95ccc72be30c404888ce7106e64d2f1f2..64dcab600183b448e86a2a734f8fde38d3e89bc4 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -950,11 +950,11 @@ X509_set_pubkey(x509, pkey);
 
 name = X509_get_subject_name(x509);
 X509_NAME_add_entry_by_txt(name, "C",
-                         MBSTRING_ASC, "UK", -1, -1, 0);
+                         MBSTRING_ASC, CUS "UK", -1, -1, 0);
 X509_NAME_add_entry_by_txt(name, "O",
-                         MBSTRING_ASC, "Exim Developers", -1, -1, 0);
+                         MBSTRING_ASC, CUS "Exim Developers", -1, -1, 0);
 X509_NAME_add_entry_by_txt(name, "CN",
-                         MBSTRING_ASC, CS smtp_active_hostname, -1, -1, 0);
+                         MBSTRING_ASC, CUS smtp_active_hostname, -1, -1, 0);
 X509_set_issuer_name(x509, name);
 
 where = US"signing cert";
@@ -2360,15 +2360,15 @@ if (ssl_xfer_buffer_lwm >= ssl_xfer_buffer_hwm)
 return ssl_xfer_buffer[ssl_xfer_buffer_lwm++];
 }
 
-#ifndef DISABLE_DKIM
 void
 tls_get_cache()
 {
+#ifndef DISABLE_DKIM
 int n = ssl_xfer_buffer_hwm - ssl_xfer_buffer_lwm;
 if (n > 0)
   dkim_exim_verify_feed(ssl_xfer_buffer+ssl_xfer_buffer_lwm, n);
-}
 #endif
+}