* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2014 - 2015 */
+/* Copyright (c) Jeremy Harris 2014 - 2019 */
/* 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.
#include <openssl/rand.h>
#include <openssl/x509v3.h>
+#ifdef LIBRESSL_VERSION_NUMBER /* LibreSSL */
+# if LIBRESSL_VERSION_NUMBER >= 0x2090000fL
+# define EXIM_HAVE_ASN1_MACROS
+# endif
+#else /* OpenSSL */
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+# define EXIM_HAVE_ASN1_MACROS
+# endif
+#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
-*****************************************************/
-int
+******************************************************
+Return booolean success
+*/
+BOOL
tls_export_cert(uschar * buf, size_t buflen, void * cert)
{
BIO * bp = BIO_new(BIO_s_mem());
-int fail;
+BOOL fail;
if ((fail = PEM_write_bio_X509(bp, (X509 *)cert) ? 0 : 1))
log_write(0, LOG_MAIN, "TLS error in certificate export: %s",
}
BIO_free(bp);
-return fail;
+return !fail;
}
-int
+/* On error, NULL out the destination */
+BOOL
tls_import_cert(const uschar * buf, void ** cert)
{
-void * reset_point = store_get(0);
+rmark reset_point = store_mark();
const uschar * cp = string_unprinting(US buf);
BIO * bp;
X509 * x = *(X509 **)cert;
-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)))
- {
log_write(0, LOG_MAIN, "TLS error in certificate import: %s",
ERR_error_string(ERR_get_error(), NULL));
- fail = 1;
- }
-else
- *cert = (void *)x;
+
+*cert = (void *)x;
BIO_free(bp);
store_reset(reset_point);
-return fail;
+return !!x;
}
void
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);
/*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
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
{
- if (!timestamps_utc) /* decoded string in local TZ */
+ if (!f.timestamps_utc) /* decoded string in local TZ */
{ /* shift to local TZ */
restore_tz(tz);
mod_tz = FALSE;
/* convert to string in our format */
len = 32;
- s = store_get(len);
+ s = store_get(len, FALSE);
strftime(CS s, (size_t)len, "%b %e %T %Y %z", tm_p);
}
}
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 *
if (!bp) return badalloc();
+#ifdef EXIM_HAVE_ASN1_MACROS
+ASN1_STRING_print(bp, adata);
+#else
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);
+cp3 = cp2 = store_get(len*3+1, TRUE);
while(len)
{
- sprintf(CS cp2, "%.2x ", *cp1++);
- cp2 += 3;
+ cp2 += sprintf(CS cp2, "%.2x ", *cp1++);
len--;
}
cp2[-1] = '\0';
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';
{
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";
- 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";
- 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:
}
sk_GENERAL_NAME_free(san);
-return list;
+return string_from_gstring(list);
}
uschar *
STACK_OF(ACCESS_DESCRIPTION) * ads = (STACK_OF(ACCESS_DESCRIPTION) *)
X509_get_ext_d2i((X509 *)cert, NID_info_access, NULL, NULL);
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++;
-for (i = 0; i < adsnum; i++)
+for (int i = 0; i < adsnum; i++)
{
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);
-return list;
+return string_from_gstring(list);
}
uschar *
X509_get_ext_d2i((X509 *)cert, NID_crl_distribution_points,
NULL, NULL);
DIST_POINT * dp;
-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 (dps) for (i = 0; i < dpsnum; i++)
+if (dps) for (int i = 0, dpsnum = sk_DIST_POINT_num(dps); i < dpsnum; i++)
if ((dp = sk_DIST_POINT_value(dps, i)))
{
STACK_OF(GENERAL_NAME) * names = dp->distpoint->name.fullname;
GENERAL_NAME * np;
- int nnum = sk_GENERAL_NAME_num(names);
- int j;
- for (j = 0; j < nnum; j++)
+ for (int j = 0, nnum = sk_GENERAL_NAME_num(names); j < nnum; j++)
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);
-return list;
+return string_from_gstring(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(CUS 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;
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]);
+cp = store_get(n*2+1, TRUE);
+for (int j = 0; j < (int)n; j++) sprintf(CS cp+2*j, "%02X", md[j]);
return(cp);
}
git://git.exim.org / users / jgh / exim.git / blobdiff