Bitrot: More OpenSSL 1.1.0 API constification

The accessor for ASN1_STRING has a new name and now returns const
data.  Deal with the fallout.

diff --git a/postfix/src/tls/tls.h b/postfix/src/tls/tls.h
index 78348eabd50b21b7a7adf80b059770244cac744a..211ead72212e8b2faa5d30bd258530ffef351e66 100644 (file)
--- a/postfix/src/tls/tls.h
+++ b/postfix/src/tls/tls.h
@@ -59,6 +59,7 @@ extern const NAME_CODE tls_level_table[];
  /* Backwards compatibility with OpenSSL < 1.1.0 */
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 #define OpenSSL_version_num SSLeay
++#define ASN1_STRING_get0_data ASN1_STRING_data
 #endif
 
  /*

diff --git a/postfix/src/tls/tls_verify.c b/postfix/src/tls/tls_verify.c
index ea3bfb960018bba4e788be725f562ff59ffc9e3a..0962f837788c7c9bbe4b86d28cfed07f544b4fcf 100644 (file)
--- a/postfix/src/tls/tls_verify.c
+++ b/postfix/src/tls/tls_verify.c
@@ -439,7 +439,7 @@ const char *tls_dns_name(const GENERAL_NAME * gn,
     /*
      * Safe to treat as an ASCII string possibly holding a DNS name
      */
-    dnsname = (char *) ASN1_STRING_data(gn->d.ia5);
+    dnsname = (const char *) ASN1_STRING_get0_data(gn->d.ia5);
     len = ASN1_STRING_length(gn->d.ia5);
     TRIM0(dnsname, len);