From: Stefan Eissing <icing@apache.org>
Date: Tue, 31 Oct 2023 10:28:22 +0000 (+0000)
Subject: Merge of /httpd/httpd/trunk:r1913466
X-Git-Tag: 2.4.59-rc1-candidate~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eea90d13bf34012d564f4635f686003f1329acb;p=thirdparty%2Fapache%2Fhttpd.git

Merge of /httpd/httpd/trunk:r1913466

 * mod_md: Fix the reported "until" validity of a certificate in the status
   handler. [Rainer Jung]
   Fix possible NULL deref when logging the error that an authentication
   resource could not be retrieved from the ACME server. [Stefan Eissing]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913467 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/changes-entries/md_v2.4.25.txt b/changes-entries/md_v2.4.25.txt
new file mode 100644
index 00000000000..d4bf95f1b60
--- /dev/null
+++ b/changes-entries/md_v2.4.25.txt
@@ -0,0 +1,4 @@
+ * mod_md: Fix the reported "until" validity of a certificate in the status
+   handler. [Rainer Jung]
+   Fix possible NULL deref when logging the error that an authentication
+   resource could not be retrieved from the ACME server. [Stefan Eissing]
diff --git a/modules/md/md_acme_order.c b/modules/md/md_acme_order.c
index 9e25e84c3ab..061093a4132 100644
--- a/modules/md/md_acme_order.c
+++ b/modules/md/md_acme_order.c
@@ -537,8 +537,8 @@ static apr_status_t check_challenges(void *baton, int attempt)
             }
         }
         else {
-            md_result_printf(ctx->result, rv, "authorization retrieval failed for domain %s", 
-                             authz->domain);
+            md_result_printf(ctx->result, rv, "authorization retrieval failed for %s on <%s>",
+                             ctx->name, url);
         }
     }
 leave:
diff --git a/modules/md/md_version.h b/modules/md/md_version.h
index cf62f5eb5f7..86a1821c7c8 100644
--- a/modules/md/md_version.h
+++ b/modules/md/md_version.h
@@ -27,7 +27,7 @@
  * @macro
  * Version number of the md module as c string
  */
-#define MOD_MD_VERSION "2.4.24"
+#define MOD_MD_VERSION "2.4.25"
 
 /**
  * @macro
@@ -35,7 +35,7 @@
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define MOD_MD_VERSION_NUM 0x020418
+#define MOD_MD_VERSION_NUM 0x020419
 
 #define MD_ACME_DEF_URL         "https://acme-v02.api.letsencrypt.org/directory"
 #define MD_TAILSCALE_DEF_URL    "file://localhost/var/run/tailscale/tailscaled.sock"
diff --git a/modules/md/mod_md_status.c b/modules/md/mod_md_status.c
index 22860515ffd..6b29256b678 100644
--- a/modules/md/mod_md_status.c
+++ b/modules/md/mod_md_status.c
@@ -325,7 +325,7 @@ static void si_val_valid_time(status_ctx *ctx, md_json_t *mdj, const status_info
             apr_pstrcat(ctx->p, info->label, "From", NULL));
         }
         if (until) {
-            print_date(ctx, from,
+            print_date(ctx, until,
             apr_pstrcat(ctx->p, info->label, "Until", NULL));
         }
     }