From: Stefan Eissing <icing@apache.org>
Date: Tue, 9 Mar 2021 09:20:24 +0000 (+0000)
Subject: lets try ASN1_STRING_data() for openssl 1.0.2
X-Git-Tag: 2.5.0-alpha2-ci-test-only~997
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4068b29f3382f3dd0be62d4f056f26534fbecf9c;p=thirdparty%2Fapache%2Fhttpd.git

lets try ASN1_STRING_data() for openssl 1.0.2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1887360 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c
index 8dfefa11765..a804c51fb67 100644
--- a/modules/md/md_crypt.c
+++ b/modules/md/md_crypt.c
@@ -1212,10 +1212,13 @@ apr_status_t md_cert_get_alt_names(apr_array_header_t **pnames, const md_cert_t
                     APR_ARRAY_PUSH(names, const char *) = apr_pstrdup(p, (char*)buf);
                     OPENSSL_free(buf);
                     break;
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
                 case GEN_IPADD:
                     len = ASN1_STRING_length(cval->d.iPAddress);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+                    ip = ASN1_STRING_data(cval->d.iPAddress);
+#else
                     ip = ASN1_STRING_get0_data(cval->d.iPAddress);
+#endif
                     if (len ==  4)      /* IPv4 address */
                         APR_ARRAY_PUSH(names, const char *) = apr_psprintf(p, "%u.%u.%u.%u",
                                                                            ip[0], ip[1], ip[2], ip[3]);
@@ -1232,7 +1235,6 @@ apr_status_t md_cert_get_alt_names(apr_array_header_t **pnames, const md_cert_t
                         ; /* Unknown address type - Log?  Assert? */
                     }
                     break;
-#endif
                 default:
                     break;
             }