/*****************************************************
* Export/import a certificate, binary/printable
-*****************************************************/
+******************************************************
+Return booolean success
+*/
BOOL
tls_export_cert(uschar * buf, size_t buflen, void * cert)
{
return !fail;
}
-int
+/* On error, NULL out the destination */
+BOOL
tls_import_cert(const uschar * buf, void ** cert)
{
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
/* 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);
}
}
/* 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);
}