Support REQUIRETLS

[users/heiko/exim.git] / src / src / tlscert-openssl.c

diff --git a/src/src/tlscert-openssl.c b/src/src/tlscert-openssl.c
index 7263033137e4c98859ff5c399d37c3ad7f73c860..f218322718f3492fc8f68d742643f2c34031df1f 100644 (file)
--- a/src/src/tlscert-openssl.c
+++ b/src/src/tlscert-openssl.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) Jeremy Harris 2014 */
+/* Copyright (c) Jeremy Harris 2014 - 2018 */

 
 /* This module provides TLS (aka SSL) support for Exim using the OpenSSL
 library. It is #included into the tls.c file when that library is used.
 
 /* This module provides TLS (aka SSL) support for Exim using the OpenSSL
 library. It is #included into the tls.c file when that library is used.


@@ -17,6 +17,13 @@ library. It is #included into the tls.c file when that library is used.
 #include <openssl/rand.h>
 #include <openssl/x509v3.h>
 
 #include <openssl/rand.h>
 #include <openssl/x509v3.h>
 

+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+# define EXIM_HAVE_ASN1_MACROS
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+# define ASN1_STRING_get0_data ASN1_STRING_data
+#endif

 
 /*****************************************************
 *  Export/import a certificate, binary/printable
 
 /*****************************************************
 *  Export/import a certificate, binary/printable


@@ -55,9 +62,11 @@ tls_import_cert(const uschar * buf, void ** cert)
 void * reset_point = store_get(0);
 const uschar * cp = string_unprinting(US buf);
 BIO * bp;
 void * reset_point = store_get(0);
 const uschar * cp = string_unprinting(US buf);
 BIO * bp;

-X509 * x;
+X509 * x = *(X509 **)cert;

 int fail = 0;
 
 int fail = 0;
 

+if (x) X509_free(x);
+

 bp = BIO_new_mem_buf(US cp, -1);
 if (!(x = PEM_read_bio_X509(bp, NULL, 0, NULL)))
   {
 bp = BIO_new_mem_buf(US cp, -1);
 if (!(x = PEM_read_bio_X509(bp, NULL, 0, NULL)))
   {


@@ -73,9 +82,14 @@ return fail;
 }
 
 void
 }
 
 void

-tls_free_cert(void * cert)
+tls_free_cert(void ** cert)

 {
 {

-X509_free((X509 *)cert);
+X509 * x = *(X509 **)cert;
+if (x)
+  {
+  X509_free(x);
+  *cert = NULL;
+  }

 }
 
 
 }
 
 


@@ -112,7 +126,7 @@ int len;
 if (!bp)
   return badalloc();
 len = ASN1_TIME_print(bp, asntime);
 if (!bp)
   return badalloc();
 len = ASN1_TIME_print(bp, asntime);

-len = len > 0 ? (int) BIO_get_mem_data(bp, &s) : 0;
+len = len > 0 ? (int) BIO_get_mem_data(bp, CSS &s) : 0;

 
 if (mod && Ustrcmp(mod, "raw") == 0)           /* native ASN */
   s = string_copyn(s, len);
 
 if (mod && Ustrcmp(mod, "raw") == 0)           /* native ASN */
   s = string_copyn(s, len);


@@ -120,7 +134,7 @@ else
   {
   struct tm tm;
   struct tm * tm_p = &tm;
   {
   struct tm tm;
   struct tm * tm_p = &tm;

-  BOOL mod_tz;
+  BOOL mod_tz = TRUE;

   uschar * tz = to_tz(US"GMT0");    /* need to call strptime with baseline TZ */
 
   /* Parse OpenSSL ASN1_TIME_print output.  A shame there seems to
   uschar * tz = to_tz(US"GMT0");    /* need to call strptime with baseline TZ */
 
   /* Parse OpenSSL ASN1_TIME_print output.  A shame there seems to


@@ -130,7 +144,7 @@ else
   /*XXX %Z might be glibc-specific?  Solaris has it, at least*/
   /*XXX should we switch to POSIX locale for this? */
   tm.tm_isdst = 0;
   /*XXX %Z might be glibc-specific?  Solaris has it, at least*/
   /*XXX should we switch to POSIX locale for this? */
   tm.tm_isdst = 0;

-  if (!strptime(CCS s, "%b %e %T %Y %Z", &tm))
+  if (!len || !strptime(CCS s, "%b %e %T %Y %Z", &tm))

     expand_string_message = US"failed time conversion";
 
   else
     expand_string_message = US"failed time conversion";
 
   else


@@ -138,7 +152,7 @@ else
     time_t t = mktime(&tm);    /* make the tm self-consistent */
 
     if (mod && Ustrcmp(mod, "int") == 0)       /* seconds since epoch */
     time_t t = mktime(&tm);    /* make the tm self-consistent */
 
     if (mod && Ustrcmp(mod, "int") == 0)       /* seconds since epoch */

-      s = string_sprintf("%u", t);
+      s = string_sprintf(TIME_T_FMT, t);

 
     else
       {
 
     else
       {


@@ -157,7 +171,7 @@ else
       }
     }
 
       }
     }
 

-  if (mod_tz);
+  if (mod_tz)

     restore_tz(tz);
   }
 BIO_free(bp);
     restore_tz(tz);
   }
 BIO_free(bp);


@@ -234,9 +248,9 @@ BIO * bp = BIO_new(BIO_s_mem());
 if (!bp) return badalloc();
 
 if (X509_print_ex(bp, (X509 *)cert, 0,
 if (!bp) return badalloc();
 
 if (X509_print_ex(bp, (X509 *)cert, 0,

-  X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION | X509_FLAG_NO_SERIAL | 
-  X509_FLAG_NO_SIGNAME | X509_FLAG_NO_ISSUER | X509_FLAG_NO_VALIDITY | 
-  X509_FLAG_NO_SUBJECT | X509_FLAG_NO_PUBKEY | X509_FLAG_NO_EXTENSIONS | 
+  X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION | X509_FLAG_NO_SERIAL |
+  X509_FLAG_NO_SIGNAME | X509_FLAG_NO_ISSUER | X509_FLAG_NO_VALIDITY |
+  X509_FLAG_NO_SUBJECT | X509_FLAG_NO_PUBKEY | X509_FLAG_NO_EXTENSIONS |

   /* X509_FLAG_NO_SIGDUMP is the missing one */
   X509_FLAG_NO_AUX) == 1)
   {
   /* X509_FLAG_NO_SIGDUMP is the missing one */
   X509_FLAG_NO_AUX) == 1)
   {


@@ -260,10 +274,10 @@ BIO * bp = BIO_new(BIO_s_mem());
 if (!bp) return badalloc();
 
 if (X509_print_ex(bp, (X509 *)cert, 0,
 if (!bp) return badalloc();
 
 if (X509_print_ex(bp, (X509 *)cert, 0,

-  X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION | X509_FLAG_NO_SERIAL | 
+  X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION | X509_FLAG_NO_SERIAL |

   /* X509_FLAG_NO_SIGNAME is the missing one */
   /* X509_FLAG_NO_SIGNAME is the missing one */

-  X509_FLAG_NO_ISSUER | X509_FLAG_NO_VALIDITY | 
-  X509_FLAG_NO_SUBJECT | X509_FLAG_NO_PUBKEY | X509_FLAG_NO_EXTENSIONS | 
+  X509_FLAG_NO_ISSUER | X509_FLAG_NO_VALIDITY |
+  X509_FLAG_NO_SUBJECT | X509_FLAG_NO_PUBKEY | X509_FLAG_NO_EXTENSIONS |

   X509_FLAG_NO_SIGDUMP | X509_FLAG_NO_AUX) == 1)
   {
   long len = BIO_get_mem_data(bp, &cp);
   X509_FLAG_NO_SIGDUMP | X509_FLAG_NO_AUX) == 1)
   {
   long len = BIO_get_mem_data(bp, &cp);


@@ -289,7 +303,7 @@ return mod ? tls_field_from_dn(cp, mod) : cp;
 uschar *
 tls_cert_version(void * cert, uschar * mod)
 {
 uschar *
 tls_cert_version(void * cert, uschar * mod)
 {

-return string_sprintf("%d", X509_get_version((X509 *)cert));
+return string_sprintf("%ld", X509_get_version((X509 *)cert));

 }
 
 uschar *
 }
 
 uschar *


@@ -307,17 +321,20 @@ uschar * cp3;
 
 if (!bp) return badalloc();
 
 
 if (!bp) return badalloc();
 

+#ifdef EXIM_HAVE_ASN1_MACROS
+ASN1_STRING_print(bp, adata);
+#else

 M_ASN1_OCTET_STRING_print(bp, adata);
 M_ASN1_OCTET_STRING_print(bp, adata);

-/* binary data, DER encoded */
+#endif

 
 

+/* binary data, DER encoded */

 /* just dump for now */
 len = BIO_get_mem_data(bp, &cp1);
 cp3 = cp2 = store_get(len*3+1);
 
 while(len)
   {
 /* just dump for now */
 len = BIO_get_mem_data(bp, &cp1);
 cp3 = cp2 = store_get(len*3+1);
 
 while(len)
   {

-  sprintf(CS cp2, "%.2x ", *cp1++);
-  cp2 += 3;
+  cp2 += sprintf(CS cp2, "%.2x ", *cp1++);

   len--;
   }
 cp2[-1] = '\0';
   len--;
   }
 cp2[-1] = '\0';


@@ -328,7 +345,7 @@ return cp3;
 uschar *
 tls_cert_subject_altname(void * cert, uschar * mod)
 {
 uschar *
 tls_cert_subject_altname(void * cert, uschar * mod)
 {

-uschar * list = NULL;
+gstring * list = NULL;

 STACK_OF(GENERAL_NAME) * san = (STACK_OF(GENERAL_NAME) *)
   X509_get_ext_d2i((X509 *)cert, NID_subject_alt_name, NULL, NULL);
 uschar osep = '\n';
 STACK_OF(GENERAL_NAME) * san = (STACK_OF(GENERAL_NAME) *)
   X509_get_ext_d2i((X509 *)cert, NID_subject_alt_name, NULL, NULL);
 uschar osep = '\n';


@@ -359,17 +376,17 @@ while (sk_GENERAL_NAME_num(san) > 0)
     {
     case GEN_DNS:
       tag = US"DNS";
     {
     case GEN_DNS:
       tag = US"DNS";

-      ele = ASN1_STRING_data(namePart->d.dNSName);
+      ele = US ASN1_STRING_get0_data(namePart->d.dNSName);

       len = ASN1_STRING_length(namePart->d.dNSName);
       break;
     case GEN_URI:
       tag = US"URI";
       len = ASN1_STRING_length(namePart->d.dNSName);
       break;
     case GEN_URI:
       tag = US"URI";

-      ele = ASN1_STRING_data(namePart->d.uniformResourceIdentifier);
+      ele = US ASN1_STRING_get0_data(namePart->d.uniformResourceIdentifier);

       len = ASN1_STRING_length(namePart->d.uniformResourceIdentifier);
       break;
     case GEN_EMAIL:
       tag = US"MAIL";
       len = ASN1_STRING_length(namePart->d.uniformResourceIdentifier);
       break;
     case GEN_EMAIL:
       tag = US"MAIL";

-      ele = ASN1_STRING_data(namePart->d.rfc822Name);
+      ele = US ASN1_STRING_get0_data(namePart->d.rfc822Name);

       len = ASN1_STRING_length(namePart->d.rfc822Name);
       break;
     default:
       len = ASN1_STRING_length(namePart->d.rfc822Name);
       break;
     default:


@@ -384,7 +401,7 @@ while (sk_GENERAL_NAME_num(san) > 0)
   }
 
 sk_GENERAL_NAME_free(san);
   }
 
 sk_GENERAL_NAME_free(san);

-return list;
+return string_from_gstring(list);

 }
 
 uschar *
 }
 
 uschar *


@@ -395,7 +412,7 @@ STACK_OF(ACCESS_DESCRIPTION) * ads = (STACK_OF(ACCESS_DESCRIPTION) *)
 int adsnum = sk_ACCESS_DESCRIPTION_num(ads);
 int i;
 uschar sep = '\n';
 int adsnum = sk_ACCESS_DESCRIPTION_num(ads);
 int i;
 uschar sep = '\n';

-uschar * list = NULL;
+gstring * list = NULL;

 
 if (mod)
   if (*mod == '>' && *++mod) sep = *mod++;
 
 if (mod)
   if (*mod == '>' && *++mod) sep = *mod++;


@@ -405,14 +422,12 @@ for (i = 0; i < adsnum; i++)
   ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(ads, i);
 
   if (ad && OBJ_obj2nid(ad->method) == NID_ad_OCSP)
   ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(ads, i);
 
   if (ad && OBJ_obj2nid(ad->method) == NID_ad_OCSP)

-    {
-    uschar * ele = ASN1_STRING_data(ad->location->d.ia5);
-    int len =  ASN1_STRING_length(ad->location->d.ia5);
-    list = string_append_listele_n(list, sep, ele, len);
-    }
+    list = string_append_listele_n(list, sep,
+      US ASN1_STRING_get0_data(ad->location->d.ia5),
+      ASN1_STRING_length(ad->location->d.ia5));

   }
 sk_ACCESS_DESCRIPTION_free(ads);
   }
 sk_ACCESS_DESCRIPTION_free(ads);

-return list;
+return string_from_gstring(list);

 }
 
 uschar *
 }
 
 uschar *


@@ -425,7 +440,7 @@ DIST_POINT * dp;
 int dpsnum = sk_DIST_POINT_num(dps);
 int i;
 uschar sep = '\n';
 int dpsnum = sk_DIST_POINT_num(dps);
 int i;
 uschar sep = '\n';

-uschar * list = NULL;
+gstring * list = NULL;

 
 if (mod)
   if (*mod == '>' && *++mod) sep = *mod++;
 
 if (mod)
   if (*mod == '>' && *++mod) sep = *mod++;


@@ -442,14 +457,12 @@ if (dps) for (i = 0; i < dpsnum; i++)
       if (  (np = sk_GENERAL_NAME_value(names, j))
         && np->type == GEN_URI
         )
       if (  (np = sk_GENERAL_NAME_value(names, j))
         && np->type == GEN_URI
         )

-       {
-       uschar * ele = ASN1_STRING_data(np->d.uniformResourceIdentifier);
-       int len =  ASN1_STRING_length(np->d.uniformResourceIdentifier);
-       list = string_append_listele_n(list, sep, ele, len);
-       }
+       list = string_append_listele_n(list, sep,
+         US ASN1_STRING_get0_data(np->d.uniformResourceIdentifier),
+         ASN1_STRING_length(np->d.uniformResourceIdentifier));

     }
 sk_DIST_POINT_free(dps);
     }
 sk_DIST_POINT_free(dps);

-return list;
+return string_from_gstring(list);

 }
 
 
 }
 
 


@@ -457,6 +470,26 @@ return list;
 /*****************************************************
 *  Certificate operator routines
 *****************************************************/
 /*****************************************************
 *  Certificate operator routines
 *****************************************************/

+uschar *
+tls_cert_der_b64(void * cert)
+{
+BIO * bp = BIO_new(BIO_s_mem());
+uschar * cp = NULL;
+
+if (!i2d_X509_bio(bp, (X509 *)cert))
+  log_write(0, LOG_MAIN, "TLS error in certificate export: %s",
+    ERR_error_string(ERR_get_error(), NULL));
+else
+  {
+  long len = BIO_get_mem_data(bp, &cp);
+  cp = b64encode(cp, (int)len);
+  }
+
+BIO_free(bp);
+return cp;
+}
+
+

 static uschar *
 fingerprint(X509 * cert, const EVP_MD * fdig)
 {
 static uschar *
 fingerprint(X509 * cert, const EVP_MD * fdig)
 {


@@ -475,19 +508,19 @@ for (j = 0; j < (int)n; j++) sprintf(CS cp+2*j, "%02X", md[j]);
 return(cp);
 }
 
 return(cp);
 }
 

-uschar * 
+uschar *

 tls_cert_fprt_md5(void * cert)
 {
 return fingerprint((X509 *)cert, EVP_md5());
 }
 
 tls_cert_fprt_md5(void * cert)
 {
 return fingerprint((X509 *)cert, EVP_md5());
 }
 

-uschar * 
+uschar *

 tls_cert_fprt_sha1(void * cert)
 {
 return fingerprint((X509 *)cert, EVP_sha1());
 }
 
 tls_cert_fprt_sha1(void * cert)
 {
 return fingerprint((X509 *)cert, EVP_sha1());
 }
 

-uschar * 
+uschar *

 tls_cert_fprt_sha256(void * cert)
 {
 return fingerprint((X509 *)cert, EVP_sha256());
 tls_cert_fprt_sha256(void * cert)
 {
 return fingerprint((X509 *)cert, EVP_sha256());