tidying

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

diff --git a/src/src/tlscert-openssl.c b/src/src/tlscert-openssl.c
index 53945a1e0e81d4b792daa247db163ac4c8d08343..690f9508148609b4572c587c02388c9ca4509215 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 - 2016 */

 
 /* 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,10 @@ 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
+

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


@@ -55,13 +59,18 @@ 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;
+
+if (x) X509_free(x);

 
 bp = BIO_new_mem_buf(US cp, -1);
 
 bp = BIO_new_mem_buf(US cp, -1);

-x = PEM_read_bio_X509(bp, NULL, 0, NULL);
-int fail = 0;
-if (!x)
+if (!(x = PEM_read_bio_X509(bp, NULL, 0, NULL)))
+  {
+  log_write(0, LOG_MAIN, "TLS error in certificate import: %s",
+    ERR_error_string(ERR_get_error(), NULL));

   fail = 1;
   fail = 1;

+  }

 else
   *cert = (void *)x;
 BIO_free(bp);
 else
   *cert = (void *)x;
 BIO_free(bp);


@@ -70,18 +79,34 @@ 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;
+  }

 }
 
 }
 

+

 /*****************************************************
 *  Certificate field extraction routines
 *****************************************************/
 /*****************************************************
 *  Certificate field extraction routines
 *****************************************************/

+
+/* First, some internal service functions */
+
+static uschar *
+badalloc(void)
+{
+expand_string_message = US"allocation failure";
+return NULL;
+}
+

 static uschar *
 bio_string_copy(BIO * bp, int len)
 {
 static uschar *
 bio_string_copy(BIO * bp, int len)
 {

-uschar * cp = "";
+uschar * cp = US"";

 len = len > 0 ? (int) BIO_get_mem_data(bp, &cp) : 0;
 cp = string_copyn(cp, len);
 BIO_free(bp);
 len = len > 0 ? (int) BIO_get_mem_data(bp, &cp) : 0;
 cp = string_copyn(cp, len);
 BIO_free(bp);


@@ -89,41 +114,108 @@ return cp;
 }
 
 static uschar *
 }
 
 static uschar *

-asn1_time_copy(const ASN1_TIME * time)
+asn1_time_copy(const ASN1_TIME * asntime, uschar * mod)

 {
 {

+uschar * s = NULL;

 BIO * bp = BIO_new(BIO_s_mem());
 BIO * bp = BIO_new(BIO_s_mem());

-int len = ASN1_TIME_print(bp, time);
-return bio_string_copy(bp, len);
+int len;
+
+if (!bp)
+  return badalloc();
+len = ASN1_TIME_print(bp, asntime);
+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);
+else
+  {
+  struct tm tm;
+  struct tm * tm_p = &tm;
+  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
+  be no other interface for the times.
+  */
+
+  /*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 (!len || !strptime(CCS s, "%b %e %T %Y %Z", &tm))
+    expand_string_message = US"failed time conversion";
+
+  else
+    {
+    time_t t = mktime(&tm);    /* make the tm self-consistent */
+
+    if (mod && Ustrcmp(mod, "int") == 0)       /* seconds since epoch */
+      s = string_sprintf("%u", t);
+
+    else
+      {
+      if (!timestamps_utc)     /* decoded string in local TZ */
+       {                               /* shift to local TZ */
+       restore_tz(tz);
+       mod_tz = FALSE;
+       tm_p = localtime(&t);
+       }
+      /* "utc" is default, and rfc5280 says cert times should be Zulu */
+
+      /* convert to string in our format */
+      len = 32;
+      s = store_get(len);
+      strftime(CS s, (size_t)len, "%b %e %T %Y %z", tm_p);
+      }
+    }
+
+  if (mod_tz)
+    restore_tz(tz);
+  }
+BIO_free(bp);
+return s;

 }
 
 static uschar *
 x509_name_copy(X509_NAME * name)
 {
 BIO * bp = BIO_new(BIO_s_mem());
 }
 
 static uschar *
 x509_name_copy(X509_NAME * name)
 {
 BIO * bp = BIO_new(BIO_s_mem());

-int len_good =
+int len_good;
+
+if (!bp) return badalloc();
+
+len_good =

   X509_NAME_print_ex(bp, name, 0, XN_FLAG_RFC2253) >= 0
   ? 1 : 0;
 return bio_string_copy(bp, len_good);
 }
 
 /**/
   X509_NAME_print_ex(bp, name, 0, XN_FLAG_RFC2253) >= 0
   ? 1 : 0;
 return bio_string_copy(bp, len_good);
 }
 
 /**/

+/* Now the extractors, called from expand.c
+Arguments:
+  cert         The certificate
+  mod          Optional modifiers for the operator
+
+Return:
+  Allocated string with extracted value
+*/

 
 uschar *
 tls_cert_issuer(void * cert, uschar * mod)
 {
 
 uschar *
 tls_cert_issuer(void * cert, uschar * mod)
 {

-return x509_name_copy(X509_get_issuer_name((X509 *)cert));
+uschar * cp = x509_name_copy(X509_get_issuer_name((X509 *)cert));
+return mod ? tls_field_from_dn(cp, mod) : cp;

 }
 
 uschar *
 tls_cert_not_before(void * cert, uschar * mod)
 {
 }
 
 uschar *
 tls_cert_not_before(void * cert, uschar * mod)
 {

-return asn1_time_copy(X509_get_notBefore((X509 *)cert));
+return asn1_time_copy(X509_get_notBefore((X509 *)cert), mod);

 }
 
 uschar *
 tls_cert_not_after(void * cert, uschar * mod)
 {
 }
 
 uschar *
 tls_cert_not_after(void * cert, uschar * mod)
 {

-return asn1_time_copy(X509_get_notAfter((X509 *)cert));
+return asn1_time_copy(X509_get_notAfter((X509 *)cert), mod);

 }
 
 uschar *
 }
 
 uschar *


@@ -131,8 +223,11 @@ tls_cert_serial_number(void * cert, uschar * mod)
 {
 uschar txt[256];
 BIO * bp = BIO_new(BIO_s_mem());
 {
 uschar txt[256];
 BIO * bp = BIO_new(BIO_s_mem());

-int len = i2a_ASN1_INTEGER(bp, X509_get_serialNumber((X509 *)cert));
+int len;
+
+if (!bp) return badalloc();

 
 

+len = i2a_ASN1_INTEGER(bp, X509_get_serialNumber((X509 *)cert));

 if (len < sizeof(txt))
   BIO_read(bp, txt, len);
 else
 if (len < sizeof(txt))
   BIO_read(bp, txt, len);
 else


@@ -144,18 +239,24 @@ return string_copynlc(txt, len);  /* lowercase */
 uschar *
 tls_cert_signature(void * cert, uschar * mod)
 {
 uschar *
 tls_cert_signature(void * cert, uschar * mod)
 {

-BIO * bp = BIO_new(BIO_s_mem());

 uschar * cp = NULL;
 uschar * cp = NULL;

+BIO * bp = BIO_new(BIO_s_mem());
+
+if (!bp) return badalloc();

 
 if (X509_print_ex(bp, (X509 *)cert, 0,
 
 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)
   {
   long len = BIO_get_mem_data(bp, &cp);
   /* X509_FLAG_NO_SIGDUMP is the missing one */
   X509_FLAG_NO_AUX) == 1)
   {
   long len = BIO_get_mem_data(bp, &cp);

-  cp = string_copyn(cp, len);
+
+  /* Strip leading "Signature Algorithm" line */
+  while (*cp && *cp != '\n') { cp++; len--; }
+
+  cp = string_copyn(cp+1, len-1);

   }
 BIO_free(bp);
 return cp;
   }
 BIO_free(bp);
 return cp;


@@ -164,13 +265,36 @@ return cp;
 uschar *
 tls_cert_signature_algorithm(void * cert, uschar * mod)
 {
 uschar *
 tls_cert_signature_algorithm(void * cert, uschar * mod)
 {

-return string_copy(OBJ_nid2ln(X509_get_signature_type((X509 *)cert)));
+uschar * cp = NULL;
+BIO * bp = BIO_new(BIO_s_mem());
+
+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 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_SIGDUMP | X509_FLAG_NO_AUX) == 1)
+  {
+  long len = BIO_get_mem_data(bp, &cp);
+
+  /* Strip leading "    Signature Algorithm: " and trailing newline */
+  while (*cp && *cp != ':') { cp++; len--; }
+  do { cp++; len--; } while (*cp && *cp == ' ');
+  if (cp[len-1] == '\n') len--;
+
+  cp = string_copyn(cp, len);
+  }
+BIO_free(bp);
+return cp;

 }
 
 uschar *
 tls_cert_subject(void * cert, uschar * mod)
 {
 }
 
 uschar *
 tls_cert_subject(void * cert, uschar * mod)
 {

-return x509_name_copy(X509_get_subject_name((X509 *)cert));
+uschar * cp = x509_name_copy(X509_get_subject_name((X509 *)cert));
+return mod ? tls_field_from_dn(cp, mod) : cp;

 }
 
 uschar *
 }
 
 uschar *


@@ -182,7 +306,7 @@ return string_sprintf("%d", X509_get_version((X509 *)cert));
 uschar *
 tls_cert_ext_by_oid(void * cert, uschar * oid, int idx)
 {
 uschar *
 tls_cert_ext_by_oid(void * cert, uschar * oid, int idx)
 {

-int nid = OBJ_create(oid, "", "");
+int nid = OBJ_create(CS oid, "", "");

 int nidx = X509_get_ext_by_NID((X509 *)cert, nid, idx);
 X509_EXTENSION * ex = X509_get_ext((X509 *)cert, nidx);
 ASN1_OCTET_STRING * adata = X509_EXTENSION_get_data(ex);
 int nidx = X509_get_ext_by_NID((X509 *)cert, nid, idx);
 X509_EXTENSION * ex = X509_get_ext((X509 *)cert, nidx);
 ASN1_OCTET_STRING * adata = X509_EXTENSION_get_data(ex);


@@ -192,16 +316,22 @@ uschar * cp1;
 uschar * cp2;
 uschar * cp3;
 
 uschar * cp2;
 uschar * cp3;
 

+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(cp2, "%.2x ", *cp1++);
+  sprintf(CS cp2, "%.2x ", *cp1++);

   cp2 += 3;
   len--;
   }
   cp2 += 3;
   len--;
   }


@@ -216,23 +346,23 @@ tls_cert_subject_altname(void * cert, uschar * mod)
 uschar * list = NULL;
 STACK_OF(GENERAL_NAME) * san = (STACK_OF(GENERAL_NAME) *)
   X509_get_ext_d2i((X509 *)cert, NID_subject_alt_name, NULL, NULL);
 uschar * list = NULL;
 STACK_OF(GENERAL_NAME) * san = (STACK_OF(GENERAL_NAME) *)
   X509_get_ext_d2i((X509 *)cert, NID_subject_alt_name, NULL, NULL);

-uschar sep = '\n';
+uschar osep = '\n';

 uschar * tag = US"";
 uschar * ele;
 int match = -1;
 uschar * tag = US"";
 uschar * ele;
 int match = -1;

+int len;

 
 if (!san) return NULL;
 
 
 if (!san) return NULL;
 

-while (mod)
+while (mod && *mod)

   {
   {

-  if (*mod == '>' && *++mod) sep = *mod++;
-  else if (Ustrcmp(mod, "dns")==0) { match = GEN_DNS; mod += 3; }
-  else if (Ustrcmp(mod, "uri")==0) { match = GEN_URI; mod += 3; }
-  else if (Ustrcmp(mod, "mail")==0) { match = GEN_EMAIL; mod += 4; }
-  else continue;
+  if (*mod == '>' && *++mod) osep = *mod++;
+  else if (Ustrncmp(mod,"dns",3)==0) { match = GEN_DNS; mod += 3; }
+  else if (Ustrncmp(mod,"uri",3)==0) { match = GEN_URI; mod += 3; }
+  else if (Ustrncmp(mod,"mail",4)==0) { match = GEN_EMAIL; mod += 4; }
+  else mod++;

 
 

-  if (*mod++ != ',')
-    break;
+  if (*mod == ',') mod++;

   }
 
 while (sk_GENERAL_NAME_num(san) > 0)
   }
 
 while (sk_GENERAL_NAME_num(san) > 0)


@@ -245,19 +375,26 @@ while (sk_GENERAL_NAME_num(san) > 0)
     case GEN_DNS:
       tag = US"DNS";
       ele = ASN1_STRING_data(namePart->d.dNSName);
     case GEN_DNS:
       tag = US"DNS";
       ele = ASN1_STRING_data(namePart->d.dNSName);

+      len = ASN1_STRING_length(namePart->d.dNSName);

       break;
     case GEN_URI:
       tag = US"URI";
       ele = ASN1_STRING_data(namePart->d.uniformResourceIdentifier);
       break;
     case GEN_URI:
       tag = US"URI";
       ele = ASN1_STRING_data(namePart->d.uniformResourceIdentifier);

+      len = ASN1_STRING_length(namePart->d.uniformResourceIdentifier);

       break;
     case GEN_EMAIL:
       tag = US"MAIL";
       ele = ASN1_STRING_data(namePart->d.rfc822Name);
       break;
     case GEN_EMAIL:
       tag = US"MAIL";
       ele = ASN1_STRING_data(namePart->d.rfc822Name);

+      len = ASN1_STRING_length(namePart->d.rfc822Name);

       break;
     default:
       continue;        /* ignore unrecognised types */
     }
       break;
     default:
       continue;        /* ignore unrecognised types */
     }

-  list = string_append_listele(list, sep,
+  if (ele[len])        /* not nul-terminated */
+    ele = string_copyn(ele, len);
+
+  if (Ustrlen(ele) == len)     /* ignore any with embedded nul */
+    list = string_append_listele(list, osep,

          match == -1 ? string_sprintf("%s=%s", tag, ele) : ele);
   }
 
          match == -1 ? string_sprintf("%s=%s", tag, ele) : ele);
   }
 


@@ -283,9 +420,13 @@ 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)

-    list = string_append_listele(list, sep,
-             ASN1_STRING_data(ad->location->d.ia5));
+    {
+    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);
+    }

   }
   }

+sk_ACCESS_DESCRIPTION_free(ads);

 return list;
 }
 
 return list;
 }
 


@@ -316,12 +457,78 @@ 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
         )

-       list = string_append_listele(list, sep,
-               ASN1_STRING_data(np->d.uniformResourceIdentifier));
+       {
+       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);
+       }

     }
     }

+sk_DIST_POINT_free(dps);

 return list;
 }
 
 return list;
 }
 

+
+
+/*****************************************************
+*  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)
+{
+int j;
+unsigned int n;
+uschar md[EVP_MAX_MD_SIZE];
+uschar * cp;
+
+if (!X509_digest(cert,fdig,md,&n))
+  {
+  expand_string_message = US"tls_cert_fprt: out of mem\n";
+  return NULL;
+  }
+cp = store_get(n*2+1);
+for (j = 0; j < (int)n; j++) sprintf(CS cp+2*j, "%02X", md[j]);
+return(cp);
+}
+
+uschar *
+tls_cert_fprt_md5(void * cert)
+{
+return fingerprint((X509 *)cert, EVP_md5());
+}
+
+uschar *
+tls_cert_fprt_sha1(void * cert)
+{
+return fingerprint((X509 *)cert, EVP_sha1());
+}
+
+uschar *
+tls_cert_fprt_sha256(void * cert)
+{
+return fingerprint((X509 *)cert, EVP_sha256());
+}
+
+

 /* vi: aw ai sw=2
 */
 /* End of tlscert-openssl.c */
 /* vi: aw ai sw=2
 */
 /* End of tlscert-openssl.c */