Brining in last changes from apache subversion, tagging for v2.4.2

icing · May 18, 2021 · 58b9f29 · 58b9f29
1 parent ddb85d4
commit 58b9f29
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+v2.4.2
+----------------------------------------------------------------------------------------------------
+ * This release needs at least Apache httpd 2.4.48 or later.
+ * Fixed missing definitions when compiling against libressl. [Giovanni Bechis <[email protected]>]
  * Making sure mod_md initializes after mod_watchdog, as otherwise jobs are not registered.
  * Adjusted test cases to work with mod_tls for OCSP stapling.
  * Implemented the new OCSP provisioning hooks in apache core.

diff --git a/src/md_crypt.c b/src/md_crypt.c
@@ -71,6 +71,11 @@
 #include <openssl/ct.h>
 #endif
 
+#if defined(LIBRESSL_VERSION_NUMBER)
+#define EVP_PKEY_X25519 NID_X25519
+#define EVP_PKEY_X448 NID_X448
+#endif
+
 static int initialized;
 
 struct md_pkey_t {

diff --git a/src/md_reg.h b/src/md_reg.h
@@ -124,7 +124,7 @@ apr_status_t md_reg_get_cred_files(const char **pkeyfile, const char **pcertfile
                                    const md_t *md, struct md_pkey_spec_t *spec, apr_pool_t *p);
 
 /**
- * Synchronise the give master mds with the store.
+ * Synchronize the given master mds with the store.
  */
 apr_status_t md_reg_sync_start(md_reg_t *reg, apr_array_header_t *master_mds, apr_pool_t *p);