projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MacOS: fix build
[exim.git]
/
src
/
src
/
tlscert-openssl.c
diff --git
a/src/src/tlscert-openssl.c
b/src/src/tlscert-openssl.c
index bfd4dc112a93f31c705fc32ae2776bcf2d4451cb..7e0128ee42ccac0c5d79fd792b37f1b9a33decda 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
6
*/
+/* Copyright (c) Jeremy Harris 2014 - 201
8
*/
/* 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.
@@
-21,6
+21,9
@@
library. It is #included into the tls.c file when that library is used.
# define EXIM_HAVE_ASN1_MACROS
#endif
# define EXIM_HAVE_ASN1_MACROS
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+# define ASN1_STRING_get0_data ASN1_STRING_data
+#endif
/*****************************************************
* Export/import a certificate, binary/printable
/*****************************************************
* Export/import a certificate, binary/printable
@@
-149,11
+152,11
@@
else
time_t t = mktime(&tm); /* make the tm self-consistent */
if (mod && Ustrcmp(mod, "int") == 0) /* seconds since epoch */
time_t t = mktime(&tm); /* make the tm self-consistent */
if (mod && Ustrcmp(mod, "int") == 0) /* seconds since epoch */
- s = string_sprintf(
"%u"
, t);
+ s = string_sprintf(
TIME_T_FMT
, t);
else
{
else
{
- if (!
timestamps_utc)
/* decoded string in local TZ */
+ if (!
f.timestamps_utc)
/* decoded string in local TZ */
{ /* shift to local TZ */
restore_tz(tz);
mod_tz = FALSE;
{ /* shift to local TZ */
restore_tz(tz);
mod_tz = FALSE;
@@
-300,7
+303,7
@@
return mod ? tls_field_from_dn(cp, mod) : cp;
uschar *
tls_cert_version(void * cert, uschar * mod)
{
uschar *
tls_cert_version(void * cert, uschar * mod)
{
-return string_sprintf("%d", X509_get_version((X509 *)cert));
+return string_sprintf("%
l
d", X509_get_version((X509 *)cert));
}
uschar *
}
uschar *
@@
-373,17
+376,17
@@
while (sk_GENERAL_NAME_num(san) > 0)
{
case GEN_DNS:
tag = US"DNS";
{
case GEN_DNS:
tag = US"DNS";
- ele =
ASN1_STRING
_data(namePart->d.dNSName);
+ ele =
US ASN1_STRING_get0
_data(namePart->d.dNSName);
len = ASN1_STRING_length(namePart->d.dNSName);
break;
case GEN_URI:
tag = US"URI";
len = ASN1_STRING_length(namePart->d.dNSName);
break;
case GEN_URI:
tag = US"URI";
- ele =
ASN1_STRING
_data(namePart->d.uniformResourceIdentifier);
+ ele =
US ASN1_STRING_get0
_data(namePart->d.uniformResourceIdentifier);
len = ASN1_STRING_length(namePart->d.uniformResourceIdentifier);
break;
case GEN_EMAIL:
tag = US"MAIL";
len = ASN1_STRING_length(namePart->d.uniformResourceIdentifier);
break;
case GEN_EMAIL:
tag = US"MAIL";
- ele =
ASN1_STRING
_data(namePart->d.rfc822Name);
+ ele =
US ASN1_STRING_get0
_data(namePart->d.rfc822Name);
len = ASN1_STRING_length(namePart->d.rfc822Name);
break;
default:
len = ASN1_STRING_length(namePart->d.rfc822Name);
break;
default:
@@
-420,7
+423,7
@@
for (i = 0; i < adsnum; i++)
if (ad && OBJ_obj2nid(ad->method) == NID_ad_OCSP)
list = string_append_listele_n(list, sep,
if (ad && OBJ_obj2nid(ad->method) == NID_ad_OCSP)
list = string_append_listele_n(list, sep,
-
ASN1_STRING
_data(ad->location->d.ia5),
+
US ASN1_STRING_get0
_data(ad->location->d.ia5),
ASN1_STRING_length(ad->location->d.ia5));
}
sk_ACCESS_DESCRIPTION_free(ads);
ASN1_STRING_length(ad->location->d.ia5));
}
sk_ACCESS_DESCRIPTION_free(ads);
@@
-455,7
+458,7
@@
if (dps) for (i = 0; i < dpsnum; i++)
&& np->type == GEN_URI
)
list = string_append_listele_n(list, sep,
&& np->type == GEN_URI
)
list = string_append_listele_n(list, sep,
-
ASN1_STRING
_data(np->d.uniformResourceIdentifier),
+
US ASN1_STRING_get0
_data(np->d.uniformResourceIdentifier),
ASN1_STRING_length(np->d.uniformResourceIdentifier));
}
sk_DIST_POINT_free(dps);
ASN1_STRING_length(np->d.uniformResourceIdentifier));
}
sk_DIST_POINT_free(dps);