git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GSASL channel-binding: TLS resumption checks
[exim.git]
/
src
/
src
/
tlscert-openssl.c
diff --git
a/src/src/tlscert-openssl.c
b/src/src/tlscert-openssl.c
index f9808b3542435f68d50326aba26f9792022b51a9..403dc4236c89975f8b63032fabe91b8bb54cd80d 100644
(file)
--- a/
src/src/tlscert-openssl.c
+++ b/
src/src/tlscert-openssl.c
@@
-33,12
+33,14
@@
library. It is #included into the tls.c file when that library is used.
/*****************************************************
* Export/import a certificate, binary/printable
/*****************************************************
* 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());
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",
if ((fail = PEM_write_bio_X509(bp, (X509 *)cert) ? 0 : 1))
log_write(0, LOG_MAIN, "TLS error in certificate export: %s",
@@
-59,32
+61,29
@@
else
}
BIO_free(bp);
}
BIO_free(bp);
-return fail;
+return
!
fail;
}
}
-int
+/* On error, NULL out the destination */
+BOOL
tls_import_cert(const uschar * buf, void ** cert)
{
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;
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)))
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));
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);
BIO_free(bp);
store_reset(reset_point);
-return
fail
;
+return
!!x
;
}
void
}
void
@@
-172,7
+171,7
@@
else
/* convert to string in our format */
len = 32;
/* 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);
}
}
strftime(CS s, (size_t)len, "%b %e %T %Y %z", tm_p);
}
}
@@
-336,7
+335,7
@@
M_ASN1_OCTET_STRING_print(bp, adata);
/* binary data, DER encoded */
/* just dump for now */
len = BIO_get_mem_data(bp, &cp1);
/* 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)
{
while(len)
{
@@
-503,7
+502,7
@@
if (!X509_digest(cert,fdig,md,&n))
expand_string_message = US"tls_cert_fprt: out of mem\n";
return NULL;
}
expand_string_message = US"tls_cert_fprt: out of mem\n";
return NULL;
}
-cp = store_get(n*2+1);
+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);
}
for (int j = 0; j < (int)n; j++) sprintf(CS cp+2*j, "%02X", md[j]);
return(cp);
}