* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2014 - 2017 */
+/* 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));
tls_cert_serial_number(void * cert, uschar * mod)
{
uschar bin[50], txt[150];
+uschar * sp = bin;
size_t sz = sizeof(bin);
-uschar * sp;
-uschar * dp;
int ret;
if ((ret = gnutls_x509_crt_get_serial((gnutls_x509_crt_t)cert,
bin, &sz)))
return g_err("gs0", __FUNCTION__, ret);
-for(dp = txt, sp = bin; sz; sz--)
+for(uschar * dp = txt; sz; sz--)
dp += sprintf(CS dp, "%.2x", *sp++);
for(sp = txt; sp[0]=='0' && sp[1]; ) sp++; /* leading zeroes */
return string_copy(sp);
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);
tls_cert_subject_altname(void * cert, uschar * mod)
{
gstring * list = NULL;
-int index;
size_t siz;
int ret;
uschar sep = '\n';
break;
}
-for(index = 0;; index++)
+for (int index = 0;; index++)
{
siz = 0;
switch(ret = gnutls_x509_crt_get_subject_alt_name(
gnutls_datum_t uri;
int ret;
uschar sep = '\n';
-int index;
gstring * list = NULL;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
-for(index = 0;; index++)
+for (int index = 0;; index++)
{
ret = gnutls_x509_crt_get_authority_info_access((gnutls_x509_crt_t)cert,
index, GNUTLS_IA_OCSP_URI, &uri, NULL);
tls_cert_crl_uri(void * cert, uschar * mod)
{
int ret;
-size_t siz;
uschar sep = '\n';
-int index;
gstring * list = NULL;
uschar * ele;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
-for(index = 0;; index++)
+for (int index = 0;; index++)
{
- siz = 0;
+ size_t siz = 0;
switch(ret = gnutls_x509_crt_get_crl_dist_points(
(gnutls_x509_crt_t)cert, index, NULL, &siz, NULL, NULL))
{
gnutls_strerror(fail));
return NULL;
}
-return b64encode(cp, (int)len);
+return b64encode(CUS cp, (int)len);
}
size_t siz = 0;
uschar * cp;
uschar * cp2;
-uschar * cp3;
if ((ret = gnutls_x509_crt_get_fingerprint(cert, algo, NULL, &siz))
!= GNUTLS_E_SHORT_MEMORY_BUFFER)
if ((ret = gnutls_x509_crt_get_fingerprint(cert, algo, cp, &siz)) < 0)
return g_err("gf1", __FUNCTION__, ret);
-for (cp3 = cp2 = cp+siz; cp < cp2; cp++)
+for (uschar * cp3 = cp2 = cp+siz; cp < cp2; cp++)
cp3 += sprintf(CS cp3, "%02X", *cp);
return cp2;
}