From 9cffa480fe2da9bccd450c0b23ddad468ee8b43d Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Mon, 8 Mar 2021 21:51:53 +0000 Subject: [PATCH] refrain from handling ip address alt names in pre 1.1 openssl git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1887343 13f79535-47bb-0310-9956-ffa450edef68 --- modules/md/md_crypt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c index cd9fa13daa9..8dfefa11765 100644 --- a/modules/md/md_crypt.c +++ b/modules/md/md_crypt.c @@ -1212,13 +1212,10 @@ 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_get_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]); @@ -1235,6 +1232,7 @@ 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; } -- 2.47.3