Skip to content

Commit 9449c1a

Browse files
author
Tuure Vartiainen
committed
bugfix: TLS-PSK requires at least OpenSSL 1.0.0, not OpenSSL 1.0.1.
1 parent 3fe6d46 commit 9449c1a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/ngx_http_lua_module.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
10721072
if (conf->srv.ssl_psk_identity_hint.len) {
10731073
dd("ssl psk identity hint: %.*s", (int) conf->srv.ssl_psk_identity_hint.len, conf->srv.ssl_psk_identity_hint.data);
10741074

1075-
# if OPENSSL_VERSION_NUMBER >= 0x1000100fL
1075+
# if OPENSSL_VERSION_NUMBER >= 0x1000000fL
10761076

10771077
sscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_ssl_module);
10781078
if (sscf == NULL || sscf->ssl.ctx == NULL) {
@@ -1121,7 +1121,7 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
11211121

11221122
#else
11231123

1124-
# if OPENSSL_VERSION_NUMBER >= 0x1000100fL
1124+
# if OPENSSL_VERSION_NUMBER >= 0x1000000fL
11251125

11261126
SSL_CTX_set_psk_server_callback(sscf->ssl.ctx, ngx_http_lua_ssl_psk_server_handler);
11271127

@@ -1389,7 +1389,7 @@ ngx_http_lua_set_ssl(ngx_conf_t *cf, ngx_http_lua_loc_conf_t *llcf)
13891389
dd("ssl psk identity: %.*s", (int) llcf->ssl_psk_identity.len, llcf->ssl_psk_identity.data);
13901390
dd("ssl psk key: %.*s", (int) llcf->ssl_psk_key.len, llcf->ssl_psk_key.data);
13911391

1392-
# if OPENSSL_VERSION_NUMBER >= 0x1000100fL
1392+
# if OPENSSL_VERSION_NUMBER >= 0x1000000fL
13931393

13941394
SSL_CTX_set_psk_client_callback(llcf->ssl->ctx, ngx_http_lua_ssl_psk_client_handler);
13951395

0 commit comments

Comments
 (0)