* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 - 2023 */
/* Copyright (c) Jeremy Harris 2014 - 2019 */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* 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.
/* convert to string in our format */
len = 32;
- s = store_get(len, FALSE);
+ s = store_get(len, GET_UNTAINTED);
strftime(CS s, (size_t)len, "%b %e %T %Y %z", tm_p);
}
}
X509_FLAG_NO_AUX) == 1)
{
long len = BIO_get_mem_data(bp, &cp);
+ gstring * g = NULL;
/* Strip leading "Signature Algorithm" line */
while (*cp && *cp != '\n') { cp++; len--; }
+ if (*cp) { cp++; len--; }
- cp = string_copyn(cp+1, len-1);
+ /* Strip possible leading " Signature Value:\n" (seen with OpenSSL 3.0.5) */
+ if (Ustrncmp(cp, " Signature Value:\n", 21) == 0) { cp += 21; len -= 21; }
+
+ /* Copy only hexchars and colon (different OpenSSL versions do different spacing) */
+ for ( ; len-- && *cp; cp++)
+ if (Ustrchr("0123456789abcdef:", *cp)) g = string_catn(g, cp, 1);
+ cp = string_from_gstring(g);
}
BIO_free(bp);
return cp;
/* binary data, DER encoded */
/* just dump for now */
len = BIO_get_mem_data(bp, &cp1);
-cp3 = cp2 = store_get(len*3+1, TRUE);
+cp3 = cp2 = store_get(len*3+1, GET_TAINTED);
while(len)
{
expand_string_message = US"tls_cert_fprt: out of mem\n";
return NULL;
}
-cp = store_get(n*2+1, TRUE);
+cp = store_get(n*2+1, GET_TAINTED);
for (int j = 0; j < (int)n; j++) sprintf(CS cp+2*j, "%02X", md[j]);
return(cp);
}