* modules/md: Merge from icing/md -

https://github.com/icing/mod_md/commit/9fd90380db0722f0ccc14ff1c4da0ca21d4da75c

Add OpenSSL 4.0 compatibility:

* Use getters instead of direct member access.

* Struct was made opaque in OpenSSL 4. Getters exist since OpenSSL 1.1.0.

* Keep OpenSSL 1.0.2 compatibility.

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

diff --git a/modules/md/md_ocsp.c b/modules/md/md_ocsp.c
index aee799a7b399b7fe42e168083c44eb342a3774b0..2e7f14dff310bd7978831744358e73e48851ad8a 100644 (file)
--- a/modules/md/md_ocsp.c
+++ b/modules/md/md_ocsp.c
@@ -533,13 +533,23 @@ static const char *certid_summary(const OCSP_CERTID *certid, apr_pool_t *p)
     serial = issuer = key = "???";
     OCSP_id_get0_info(&aname_hash, &amd_nid, &akey_hash, &aserial, (OCSP_CERTID*)certid);
     if (aname_hash) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
         data.len = (apr_size_t)aname_hash->length;
         data.data = (const char*)aname_hash->data;
+#else
+        data.len = (apr_size_t)ASN1_STRING_length(aname_hash);
+        data.data = (const char*)ASN1_STRING_get0_data(aname_hash);
+#endif
         md_data_to_hex(&issuer, 0, p, &data);
     }
     if (akey_hash) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
         data.len = (apr_size_t)akey_hash->length;
         data.data = (const char*)akey_hash->data;
+#else
+        data.len = (apr_size_t)ASN1_STRING_length(akey_hash);
+        data.data = (const char*)ASN1_STRING_get0_data(akey_hash);
+#endif
         md_data_to_hex(&key, 0, p, &data);
     }
     if (aserial) {