]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1869842 from trunk:
authorRuediger Pluem <rpluem@apache.org>
Wed, 8 Sep 2021 06:55:40 +0000 (06:55 +0000)
committerRuediger Pluem <rpluem@apache.org>
Wed, 8 Sep 2021 06:55:40 +0000 (06:55 +0000)
commit092dfece31edf76a104e01050e05efd76819a2c5
tree61319864065939dbad85e24715fe94dd208e9044
parent2eb09e65239060d561abb0b1d61c83e56e5f54aa
Merge r1869842 from trunk:

mod_ssl: Log private key material to file set by $SSLKEYLOGFILE in the
environment, using the standard format which can be parsed by (e.g.)
wireshark for decoding SSL/TLS traffic; supported from OpenSSL 1.1.1.

* modules/ssl/ssl_private.h: Add keylog_file to SSLModConfigRec.

* modules/ssl/ssl_engine_init.c (ssl_init_Module): Open log file if
  SSLKEYLOGFILE is set in the environment.
  (ssl_init_ctx_protocol): Register the keylog callback with OpenSSL.

* modules/ssl/ssl_engine_kernel.c (modssl_callback_keylog):
  New function.

PR: 63391
Github: closes #74

Submitted by: jorton
Reviewed by: rpluem, ylavic, jorton

Github: closes #264

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1893099 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/ssl/ssl_engine_config.c
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_engine_kernel.c
modules/ssl/ssl_private.h