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
DKIM: use string-allocate facilities for DNS lookup
[exim.git]
/
src
/
src
/
tlscert-openssl.c
diff --git
a/src/src/tlscert-openssl.c
b/src/src/tlscert-openssl.c
index 87623a8794be6f24ee4df83fa7eb2f14620454b6..d3bb8f4670442f381d42ddb3bb9047a704f64d9d 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
7
*/
/* 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,7
+152,7
@@
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
{
@@
-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 *
@@
-342,8
+345,7
@@
return cp3;
uschar *
tls_cert_subject_altname(void * cert, uschar * mod)
{
uschar *
tls_cert_subject_altname(void * cert, uschar * mod)
{
-uschar * list = NULL;
-int lsize = 0, llen = 0;
+gstring * list = NULL;
STACK_OF(GENERAL_NAME) * san = (STACK_OF(GENERAL_NAME) *)
X509_get_ext_d2i((X509 *)cert, NID_subject_alt_name, NULL, NULL);
uschar osep = '\n';
STACK_OF(GENERAL_NAME) * san = (STACK_OF(GENERAL_NAME) *)
X509_get_ext_d2i((X509 *)cert, NID_subject_alt_name, NULL, NULL);
uschar osep = '\n';
@@
-374,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:
@@
-394,12
+396,12
@@
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,
&lsize, &llen,
osep,
+ list = string_append_listele(list, osep,
match == -1 ? string_sprintf("%s=%s", tag, ele) : ele);
}
sk_GENERAL_NAME_free(san);
match == -1 ? string_sprintf("%s=%s", tag, ele) : ele);
}
sk_GENERAL_NAME_free(san);
-return
list
;
+return
string_from_gstring(list)
;
}
uschar *
}
uschar *
@@
-410,8
+412,7
@@
STACK_OF(ACCESS_DESCRIPTION) * ads = (STACK_OF(ACCESS_DESCRIPTION) *)
int adsnum = sk_ACCESS_DESCRIPTION_num(ads);
int i;
uschar sep = '\n';
int adsnum = sk_ACCESS_DESCRIPTION_num(ads);
int i;
uschar sep = '\n';
-uschar * list = NULL;
-int size = 0, len = 0;
+gstring * list = NULL;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
@@
-421,12
+422,12
@@
for (i = 0; i < adsnum; i++)
ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(ads, i);
if (ad && OBJ_obj2nid(ad->method) == NID_ad_OCSP)
ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(ads, i);
if (ad && OBJ_obj2nid(ad->method) == NID_ad_OCSP)
- list = string_append_listele_n(list,
&size, &len,
sep,
-
ASN1_STRING
_data(ad->location->d.ia5),
+ list = string_append_listele_n(list, sep,
+
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);
-return
list
;
+return
string_from_gstring(list)
;
}
uschar *
}
uschar *
@@
-439,8
+440,7
@@
DIST_POINT * dp;
int dpsnum = sk_DIST_POINT_num(dps);
int i;
uschar sep = '\n';
int dpsnum = sk_DIST_POINT_num(dps);
int i;
uschar sep = '\n';
-uschar * list = NULL;
-int size = 0, len = 0;
+gstring * list = NULL;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
if (mod)
if (*mod == '>' && *++mod) sep = *mod++;
@@
-457,12
+457,12
@@
if (dps) for (i = 0; i < dpsnum; i++)
if ( (np = sk_GENERAL_NAME_value(names, j))
&& np->type == GEN_URI
)
if ( (np = sk_GENERAL_NAME_value(names, j))
&& np->type == GEN_URI
)
- list = string_append_listele_n(list,
&size, &len,
sep,
-
ASN1_STRING
_data(np->d.uniformResourceIdentifier),
+ list = string_append_listele_n(list, sep,
+
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);
-return
list
;
+return
string_from_gstring(list)
;
}
}