diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-16 12:12:48 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-16 12:12:48 +0000 |
| commit | 3ae7955652603d895b3dbf297e78ea05465cca9b (patch) | |
| tree | cb8140dcbf740a8d572c1a2e28cc96a7686faad3 /src | |
| parent | ea5aef3deb917659e57ddbba024539793f194ac5 (diff) | |
OpenSSL: avoid using now-deprecated routines on newer versions
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/tls-openssl.c | 7 | ||||
| -rw-r--r-- | src/src/tlscert-openssl.c | 13 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index f1176a63e..9816f734f 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -228,14 +228,13 @@ return host ? FAIL : DEFER; -#ifdef EXIM_HAVE_EPHEM_RSA_KEX /************************************************* * Callback to generate RSA key * *************************************************/ /* Arguments: - s SSL connection + s SSL connection (not used) export not used keylength keylength @@ -270,7 +269,6 @@ if (!(rsa_key = RSA_generate_key(keylength, RSA_F4, NULL, NULL))) } return rsa_key; } -#endif @@ -977,8 +975,7 @@ if (!(x509 = X509_new())) goto err; where = US"generating pkey"; - /* deprecated, use RSA_generate_key_ex() */ -if (!(rsa = RSA_generate_key(1024, RSA_F4, NULL, NULL))) +if (!(rsa = rsa_callback(NULL, 0, 1024))) goto err; where = US"assigning pkey"; diff --git a/src/src/tlscert-openssl.c b/src/src/tlscert-openssl.c index 3f0767926..d3bb8f467 100644 --- a/src/src/tlscert-openssl.c +++ b/src/src/tlscert-openssl.c @@ -21,6 +21,9 @@ library. It is #included into the tls.c file when that library is used. # 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 @@ -373,17 +376,17 @@ while (sk_GENERAL_NAME_num(san) > 0) { 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"; - 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"; - 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: @@ -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, - 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); @@ -455,7 +458,7 @@ if (dps) for (i = 0; i < dpsnum; i++) && 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); |