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
build: use pkg-config for i18n
[exim.git]
/
src
/
src
/
tlscert-openssl.c
diff --git
a/src/src/tlscert-openssl.c
b/src/src/tlscert-openssl.c
index 46de499cc6fc1ab1b8d57ef266042bdf05249f23..d4b9de359191bdb28d9d8176535362803a67e5fa 100644
(file)
--- a/
src/src/tlscert-openssl.c
+++ b/
src/src/tlscert-openssl.c
@@
-2,7
+2,9
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2014 - 2018 */
+/* 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.
/* 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
+19,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)
@@
-27,12
+35,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",
@@
-53,32
+63,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
@@
-166,7
+173,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
, GET_UNTAINTED
);
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);
}
}
@@
-255,11
+262,19
@@
if (X509_print_ex(bp, (X509 *)cert, 0,
X509_FLAG_NO_AUX) == 1)
{
long len = BIO_get_mem_data(bp, &cp);
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--; }
/* Strip leading "Signature Algorithm" line */
while (*cp && *cp != '\n') { cp++; len--; }
+ if (*cp) { cp++; len--; }
+
+ /* Strip possible leading " Signature Value:\n" (seen with OpenSSL 3.0.5) */
+ if (Ustrncmp(cp, " Signature Value:\n", 21) == 0) { cp += 21; len -= 21; }
- cp = string_copyn(cp+1, len-1);
+ /* 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;
}
BIO_free(bp);
return cp;
@@
-330,7
+345,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
, GET_TAINTED
);
while(len)
{
while(len)
{
@@
-396,8
+411,9
@@
while (sk_GENERAL_NAME_num(san) > 0)
ele = string_copyn(ele, len);
if (Ustrlen(ele) == len) /* ignore any with embedded nul */
ele = string_copyn(ele, len);
if (Ustrlen(ele) == len) /* ignore any with embedded nul */
- list = string_append_listele(list, osep,
- match == -1 ? string_sprintf("%s=%s", tag, ele) : ele);
+ list = match == -1
+ ? string_append_listele_fmt(list, osep, TRUE, "%s=%s", tag, ele)
+ : string_append_listele(list, osep, ele);
}
sk_GENERAL_NAME_free(san);
}
sk_GENERAL_NAME_free(san);
@@
-497,7
+513,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
, GET_TAINTED
);
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);
}