Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/ngx_http_lua_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@
#include "ngx_http_lua_pipe.h"
#endif

#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER > 0x101010afL
/*
* BoringSSL always reports OPENSSL_VERSION_NUMBER as 1.1.1, but does provide
* SSL_CTX_set_keylog_callback()
*/
#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER > 0x101010afL \
|| defined(OPENSSL_IS_BORINGSSL)
#define HAVE_SSL_KEY_LOG 1
#endif

Expand Down
9 changes: 3 additions & 6 deletions src/ngx_http_lua_ssl_export_keying_material.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ ngx_http_lua_ffi_ssl_export_keying_material(ngx_http_request_t *r,
u_char *out, size_t out_size, const char *label, size_t llen,
const u_char *context, size_t ctxlen, int use_ctx, char **err)
{
#if defined(OPENSSL_IS_BORINGSSL) || OPENSSL_VERSION_NUMBER < 0x10101000L
*err = "BoringSSL does not support SSL_export_keying_material";
return NGX_ERROR;
#elif defined(LIBRESSL_VERSION_NUMBER)
#if defined(LIBRESSL_VERSION_NUMBER)
*err = "LibreSSL does not support SSL_export_keying_material";
return NGX_ERROR;
#elif OPENSSL_VERSION_NUMBER < 0x10101000L
Expand Down Expand Up @@ -79,8 +76,8 @@ ngx_http_lua_ffi_ssl_export_keying_material_early(ngx_http_request_t *r,
u_char *out, size_t out_size, const char *label, size_t llen,
const u_char *context, size_t ctxlen, char **err)
{
#if defined(OPENSSL_IS_BORINGSSL) || OPENSSL_VERSION_NUMBER < 0x10101000L
*err = "BoringSSL does not support SSL_export_keying_material";
#if defined(OPENSSL_IS_BORINGSSL)
*err = "BoringSSL does not support SSL_export_keying_material_early";
return NGX_ERROR;
#elif defined(LIBRESSL_VERSION_NUMBER)
*err = "LibreSSL does not support SSL_export_keying_material";
Expand Down
23 changes: 18 additions & 5 deletions t/129-ssl-socket.t
Original file line number Diff line number Diff line change
Expand Up @@ -3088,8 +3088,21 @@ SSL reused session
end

local key_log = f:read("*a")
ngx.say(key_log)
f:close()

-- the log is appended to on each request, so keep the secrets
-- of the last handshake only, identified by its client random;
-- SSL libraries log them in different orders
local random = key_log:match("(%x+) %x+\n$")
local lines = {}
for line in key_log:gmatch("[^\n]+") do
if line:find(" " .. random .. " ", 1, true) then
lines[#lines + 1] = line
end
end

table.sort(lines)
ngx.say(table.concat(lines, "\n"))
end -- do
collectgarbage()
}
Expand All @@ -3102,16 +3115,16 @@ ssl handshake: cdata
sent http request: 53 bytes.
received: HTTP/1.1 200 OK
close: 1 nil
SERVER_HANDSHAKE_TRAFFIC_SECRET [0-9a-z\s]+
EXPORTER_SECRET [0-9a-z\s]+
SERVER_TRAFFIC_SECRET_0 [0-9a-z\s]+
CLIENT_HANDSHAKE_TRAFFIC_SECRET [0-9a-z\s]+
CLIENT_TRAFFIC_SECRET_0 [0-9a-z\s]+
EXPORTER_SECRET [0-9a-z\s]+
SERVER_HANDSHAKE_TRAFFIC_SECRET [0-9a-z\s]+
SERVER_TRAFFIC_SECRET_0 [0-9a-z\s]+

--- log_level: debug
--- error_log eval
['lua ssl server name: "test.com"',
qr/SSL: TLSv1.3, cipher: "TLS_AES_256_GCM_SHA384 TLSv1.3/]
qr/SSL: TLSv1\.3, cipher: "TLS_/]
--- no_error_log
SSL reused session
[error]
Expand Down
Loading