576df0
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
576df0
index 1d201d9..0c4bf1f 100644
576df0
--- a/modules/ssl/ssl_engine_config.c
576df0
+++ b/modules/ssl/ssl_engine_config.c
576df0
@@ -75,6 +75,10 @@ SSLModConfigRec *ssl_config_global_create(server_rec *s)
576df0
     mc->stapling_refresh_mutex = NULL;
576df0
 #endif
576df0
 
576df0
+#ifdef HAVE_OPENSSL_KEYLOG
576df0
+    mc->keylog_file = NULL;
576df0
+#endif
576df0
+
576df0
     apr_pool_userdata_set(mc, SSL_MOD_CONFIG_KEY,
576df0
                           apr_pool_cleanup_null,
576df0
                           pool);
576df0
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
576df0
index ef631c1..b286053 100644
576df0
--- a/modules/ssl/ssl_engine_init.c
576df0
+++ b/modules/ssl/ssl_engine_init.c
576df0
@@ -437,6 +437,28 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
576df0
     init_bio_methods();
576df0
 #endif
576df0
 
576df0
+#ifdef HAVE_OPENSSL_KEYLOG
576df0
+    {
576df0
+        const char *logfn = getenv("SSLKEYLOGFILE");
576df0
+
576df0
+        if (logfn) {
576df0
+            rv = apr_file_open(&mc->keylog_file, logfn,
576df0
+                               APR_FOPEN_CREATE|APR_FOPEN_WRITE|APR_FOPEN_APPEND|APR_FOPEN_LARGEFILE,
576df0
+                               APR_FPROT_UREAD|APR_FPROT_UWRITE,
576df0
+                               mc->pPool);
576df0
+            if (rv) {
576df0
+                ap_log_error(APLOG_MARK, APLOG_NOTICE, rv, s, APLOGNO(10226)
576df0
+                             "Could not open log file '%s' configured via SSLKEYLOGFILE",
576df0
+                             logfn);
576df0
+                return rv;
576df0
+            }
576df0
+
576df0
+            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(10227)
576df0
+                         "Init: Logging SSL private key material to %s", logfn);
576df0
+        }
576df0
+    }
576df0
+#endif
576df0
+    
576df0
     return OK;
576df0
 }
576df0
 
576df0
@@ -796,6 +818,12 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
576df0
      * https://github.com/openssl/openssl/issues/7178 */
576df0
     SSL_CTX_clear_mode(ctx, SSL_MODE_AUTO_RETRY);
576df0
 #endif
576df0
+
576df0
+#ifdef HAVE_OPENSSL_KEYLOG
576df0
+    if (mctx->sc->mc->keylog_file) {
576df0
+        SSL_CTX_set_keylog_callback(ctx, modssl_callback_keylog);
576df0
+    }
576df0
+#endif
576df0
     
576df0
     return APR_SUCCESS;
576df0
 }
576df0
diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
576df0
index 6611610..7058865 100644
576df0
--- a/modules/ssl/ssl_engine_kernel.c
576df0
+++ b/modules/ssl/ssl_engine_kernel.c
576df0
@@ -2719,3 +2719,17 @@ int ssl_callback_SRPServerParams(SSL *ssl, int *ad, void *arg)
576df0
 }
576df0
 
576df0
 #endif /* HAVE_SRP */
576df0
+
576df0
+
576df0
+#ifdef HAVE_OPENSSL_KEYLOG
576df0
+/* Callback used with SSL_CTX_set_keylog_callback. */
576df0
+void modssl_callback_keylog(const SSL *ssl, const char *line)
576df0
+{
576df0
+    conn_rec *conn = SSL_get_app_data(ssl);
576df0
+    SSLSrvConfigRec *sc = mySrvConfig(conn->base_server);
576df0
+
576df0
+    if (sc && sc->mc->keylog_file) {
576df0
+        apr_file_printf(sc->mc->keylog_file, "%s\n", line);
576df0
+    }
576df0
+}
576df0
+#endif
576df0
diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
576df0
index 0fac5d1..2514407 100644
576df0
--- a/modules/ssl/ssl_private.h
576df0
+++ b/modules/ssl/ssl_private.h
576df0
@@ -250,6 +250,10 @@ void free_bio_methods(void);
576df0
 #endif
576df0
 #endif
576df0
 
576df0
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
576df0
+#define HAVE_OPENSSL_KEYLOG
576df0
+#endif
576df0
+
576df0
 /* mod_ssl headers */
576df0
 #include "ssl_util_ssl.h"
576df0
 
576df0
@@ -617,6 +621,12 @@ typedef struct {
576df0
     apr_global_mutex_t   *stapling_cache_mutex;
576df0
     apr_global_mutex_t   *stapling_refresh_mutex;
576df0
 #endif
576df0
+
576df0
+#ifdef HAVE_OPENSSL_KEYLOG
576df0
+    /* Used for logging if SSLKEYLOGFILE is set at startup. */
576df0
+    apr_file_t      *keylog_file;
576df0
+#endif
576df0
+
576df0
 } SSLModConfigRec;
576df0
 
576df0
 /** Structure representing configured filenames for certs and keys for
576df0
@@ -970,6 +980,11 @@ int          ssl_stapling_init_cert(server_rec *, apr_pool_t *, apr_pool_t *,
576df0
 int          ssl_callback_SRPServerParams(SSL *, int *, void *);
576df0
 #endif
576df0
 
576df0
+#ifdef HAVE_OPENSSL_KEYLOG
576df0
+/* Callback used with SSL_CTX_set_keylog_callback. */
576df0
+void         modssl_callback_keylog(const SSL *ssl, const char *line);
576df0
+#endif
576df0
+
576df0
 /**  I/O  */
576df0
 void         ssl_io_filter_init(conn_rec *, request_rec *r, SSL *);
576df0
 void         ssl_io_filter_register(apr_pool_t *);