* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2014 - 2015 */
+/* Copyright (c) Jeremy Harris 2014 - 2018 */
/* This file provides TLS/SSL support for Exim using the GnuTLS library,
one of the available supported implementations. This file is #included into
return string_sprintf("%u", (unsigned)t);
cp = store_get(len);
-if (timestamps_utc)
+if (f.timestamps_utc)
{
uschar * tz = to_tz(US"GMT0");
len = strftime(CS cp, len, "%b %e %T %Y %Z", gmtime(&t));
int ret;
ret = gnutls_x509_crt_get_extension_by_oid ((gnutls_x509_crt_t)cert,
- oid, idx, CS cp1, &siz, &crit);
+ CS oid, idx, CS cp1, &siz, &crit);
if (ret != GNUTLS_E_SHORT_MEMORY_BUFFER)
return g_err("ge0", __FUNCTION__, ret);
cp1 = store_get(siz*4 + 1);
ret = gnutls_x509_crt_get_extension_by_oid ((gnutls_x509_crt_t)cert,
- oid, idx, CS cp1, &siz, &crit);
+ CS oid, idx, CS cp1, &siz, &crit);
if (ret < 0)
return g_err("ge1", __FUNCTION__, ret);
uschar *
tls_cert_subject_altname(void * cert, uschar * mod)
{
-uschar * list = NULL;
-int lsize = 0, llen = 0;
+gstring * list = NULL;
int index;
size_t siz;
int ret;
(gnutls_x509_crt_t)cert, index, NULL, &siz, NULL))
{
case GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE:
- return list; /* no more elements; normal exit */
+ return string_from_gstring(list); /* no more elements; normal exit */
case GNUTLS_E_SHORT_MEMORY_BUFFER:
break;
case GNUTLS_SAN_RFC822NAME: tag = US"MAIL"; break;
default: continue; /* ignore unrecognised types */
}
- list = string_append_listele(list, &lsize, &llen, sep,
+ list = string_append_listele(list, sep,
match == -1 ? string_sprintf("%s=%s", tag, ele) : ele);
}
/*NOTREACHED*/
int ret;
uschar sep = '\n';
int index;
-uschar * list = NULL;
-int lsize = 0, llen = 0;
+gstring * list = NULL;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
index, GNUTLS_IA_OCSP_URI, &uri, NULL);
if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
- return list;
+ return string_from_gstring(list);
if (ret < 0)
return g_err("gai", __FUNCTION__, ret);
- list = string_append_listele_n(list, &lsize, &llen, sep,
- uri.data, uri.size);
+ list = string_append_listele_n(list, sep, uri.data, uri.size);
}
/*NOTREACHED*/
size_t siz;
uschar sep = '\n';
int index;
-uschar * list = NULL;
-int lsize = 0, llen = 0;
+gstring * list = NULL;
uschar * ele;
if (mod)
(gnutls_x509_crt_t)cert, index, NULL, &siz, NULL, NULL))
{
case GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE:
- return list;
+ return string_from_gstring(list);
case GNUTLS_E_SHORT_MEMORY_BUFFER:
break;
default:
(gnutls_x509_crt_t)cert, index, ele, &siz, NULL, NULL)) < 0)
return g_err("gc1", __FUNCTION__, ret);
- list = string_append_listele_n(list, &lsize, &llen, sep, ele, siz);
+ list = string_append_listele_n(list, sep, ele, siz);
}
/*NOTREACHED*/
}