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
Always check return from tls_export_cert()
[exim.git]
/
src
/
src
/
tlscert-openssl.c
diff --git
a/src/src/tlscert-openssl.c
b/src/src/tlscert-openssl.c
index 7e0128ee42ccac0c5d79fd792b37f1b9a33decda..845c3014f0e856a6a7cec4a8b4d48b983857ec96 100644
(file)
--- a/
src/src/tlscert-openssl.c
+++ b/
src/src/tlscert-openssl.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2014 - 201
8
*/
+/* Copyright (c) Jeremy Harris 2014 - 201
9
*/
/* 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.
/* 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.
@@
-17,8
+17,14
@@
library. It is #included into the tls.c file when that library is used.
#include <openssl/rand.h>
#include <openssl/x509v3.h>
#include <openssl/rand.h>
#include <openssl/x509v3.h>
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-# define EXIM_HAVE_ASN1_MACROS
+#ifdef LIBRESSL_VERSION_NUMBER /* LibreSSL */
+# if LIBRESSL_VERSION_NUMBER >= 0x2090000fL
+# define EXIM_HAVE_ASN1_MACROS
+# endif
+#else /* OpenSSL */
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+# define EXIM_HAVE_ASN1_MACROS
+# endif
#endif
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#endif
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
@@
-28,11
+34,11
@@
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
+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",
@@
-53,13
+59,13
@@
else
}
BIO_free(bp);
}
BIO_free(bp);
-return fail;
+return
!
fail;
}
int
tls_import_cert(const uschar * buf, void ** cert)
{
}
int
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;
@@
-166,7
+172,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);
}
}
@@
-330,7
+336,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)
{
@@
-410,14
+416,13
@@
tls_cert_ocsp_uri(void * cert, uschar * mod)
STACK_OF(ACCESS_DESCRIPTION) * ads = (STACK_OF(ACCESS_DESCRIPTION) *)
X509_get_ext_d2i((X509 *)cert, NID_info_access, NULL, NULL);
int adsnum = sk_ACCESS_DESCRIPTION_num(ads);
STACK_OF(ACCESS_DESCRIPTION) * ads = (STACK_OF(ACCESS_DESCRIPTION) *)
X509_get_ext_d2i((X509 *)cert, NID_info_access, NULL, NULL);
int adsnum = sk_ACCESS_DESCRIPTION_num(ads);
-int i;
uschar sep = '\n';
gstring * list = NULL;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
uschar sep = '\n';
gstring * list = NULL;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
-for (i = 0; i < adsnum; i++)
+for (i
nt i
= 0; i < adsnum; i++)
{
ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(ads, i);
{
ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(ads, i);
@@
-437,23
+442,19
@@
STACK_OF(DIST_POINT) * dps = (STACK_OF(DIST_POINT) *)
X509_get_ext_d2i((X509 *)cert, NID_crl_distribution_points,
NULL, NULL);
DIST_POINT * dp;
X509_get_ext_d2i((X509 *)cert, NID_crl_distribution_points,
NULL, NULL);
DIST_POINT * dp;
-int dpsnum = sk_DIST_POINT_num(dps);
-int i;
uschar sep = '\n';
gstring * list = NULL;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
uschar sep = '\n';
gstring * list = NULL;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
-if (dps) for (i
= 0
; i < dpsnum; i++)
+if (dps) for (i
nt i = 0, dpsnum = sk_DIST_POINT_num(dps)
; i < dpsnum; i++)
if ((dp = sk_DIST_POINT_value(dps, i)))
{
STACK_OF(GENERAL_NAME) * names = dp->distpoint->name.fullname;
GENERAL_NAME * np;
if ((dp = sk_DIST_POINT_value(dps, i)))
{
STACK_OF(GENERAL_NAME) * names = dp->distpoint->name.fullname;
GENERAL_NAME * np;
- int nnum = sk_GENERAL_NAME_num(names);
- int j;
- for (
j = 0
; j < nnum; j++)
+ for (
int j = 0, nnum = sk_GENERAL_NAME_num(names)
; j < nnum; j++)
if ( (np = sk_GENERAL_NAME_value(names, j))
&& np->type == GEN_URI
)
if ( (np = sk_GENERAL_NAME_value(names, j))
&& np->type == GEN_URI
)
@@
-482,7
+483,7
@@
if (!i2d_X509_bio(bp, (X509 *)cert))
else
{
long len = BIO_get_mem_data(bp, &cp);
else
{
long len = BIO_get_mem_data(bp, &cp);
- cp = b64encode(cp, (int)len);
+ cp = b64encode(
CUS
cp, (int)len);
}
BIO_free(bp);
}
BIO_free(bp);
@@
-493,7
+494,6
@@
return cp;
static uschar *
fingerprint(X509 * cert, const EVP_MD * fdig)
{
static uschar *
fingerprint(X509 * cert, const EVP_MD * fdig)
{
-int j;
unsigned int n;
uschar md[EVP_MAX_MD_SIZE];
uschar * cp;
unsigned int n;
uschar md[EVP_MAX_MD_SIZE];
uschar * cp;
@@
-503,8
+503,8
@@
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);
-for (j = 0; j < (int)n; j++) sprintf(CS cp+2*j, "%02X", md[j]);
+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);
}
return(cp);
}