Code

feature: ssl: support for TLS-PSK#1167

Code

Open

vartiait wants to merge 30 commits intoopenresty:masteropenresty/lua-nginx-module:masterfrom

vartiait:ssl-pskvartiait/lua-nginx-module:ssl-pskCopy head branch name to clipboard

Commits

Commits on Oct 14, 2017

• feature: TLS-PSK handshake control.

  Show description for 7fc0fac
  

  Tuure Vartiainen

  committed
  7fc0fac

  Copy full SHA for 7fc0fac

• tests: added a test case for TLS-PSK upstream and downstream.

  

  Tuure Vartiainen

  committed
  26bd228

  Copy full SHA for 26bd228

• travis-ci: use ssl-psk branch of lua-resty-core.

  

  Tuure Vartiainen

  committed
  7f5808a

  Copy full SHA for 7f5808a

• config: fixed a typo, include ngx_http_lua_ssl_pskby.h in HTTP_LUA_DEPS.

  

  Tuure Vartiainen

  committed
  78e1aed

  Copy full SHA for 78e1aed

• bugfix: TLS-PSK requires at least OpenSSL 1.0.0, not OpenSSL 1.0.1.

  

  Tuure Vartiainen

  committed
  a22ed55

  Copy full SHA for a22ed55

• tests: fixed a typo in TLS-PSK test case.

  

  Tuure Vartiainen

  committed
  a250455

  Copy full SHA for a250455

• doc: documented ssl_psk_by_lua_block, ssl_psk_by_lua_file, ssl_psk_identity_hint, lua_ssl_psk_identity and lua_ssl_psk_key directives.

  

  Tuure Vartiainen

  committed
  88737ed

  Copy full SHA for 88737ed

• style: fixed oversized lines.

  

  Tuure Vartiainen

  committed
  8b308df

  Copy full SHA for 8b308df

• style: fixed one oversized line.

  

  Tuure Vartiainen

  committed
  1b9827f

  Copy full SHA for 1b9827f

• tests: Use TLSv1 in TLS-PSK test case.

  

  Tuure Vartiainen

  committed
  e2c532e

  Copy full SHA for e2c532e

• tests: Fixed a typo, use TLSv1 in TLS-PSK test case.

  

  Tuure Vartiainen

  committed
  121534b

  Copy full SHA for 121534b

• bugfix: use correct memory pool for ngx_palloc in ngx_http_lua_ffi_ssl_set_psk_key

  

  Tuure Vartiainen

  committed
  92ebec5

  Copy full SHA for 92ebec5

• tests: trigger travis-ci run again

  

  Tuure Vartiainen

  committed
  a28db8b

  Copy full SHA for a28db8b

• bugfix: get return value of ssl_psk_by_lua_* pcall.

  

  Tuure Vartiainen

  committed
  1a03ba2

  Copy full SHA for 1a03ba2

• tests: trigger travis-ci run again.

  

  Tuure Vartiainen

  committed
  aaeee58

  Copy full SHA for aaeee58

• tests: trigger travis-ci run again.

  

  Tuure Vartiainen

  committed
  7766377

  Copy full SHA for 7766377

• doc: generated a new markdown version.

  

  Tuure Vartiainen

  committed
  2e2c5d9

  Copy full SHA for 2e2c5d9

• doc: updated the documentation to point to a related branch of lua-resty-core containing TLS-PSK functions.

  

  Tuure Vartiainen

  committed
  375a933

  Copy full SHA for 375a933

• doc: updated the documentation to point to a related branch of lua-resty-core containing TLS-PSK functions.

  

  Tuure Vartiainen

  committed
  7d319c9

  Copy full SHA for 7d319c9

• doc: updated the documentation to contain a better example of using ssl_psk_by_lua_block.

  

  Tuure Vartiainen

  committed
  b234464

  Copy full SHA for b234464

• bugfix: return NGX_OK in ngx_http_lua_ffi_exit when in NGX_HTTP_LUA_CONTEXT_SSL_PSK.

  

  Tuure Vartiainen

  committed
  81a1273

  Copy full SHA for 81a1273

• Removed trailing white spaces.

  

  Tuure Vartiainen

  committed
  dda90bc

  Copy full SHA for dda90bc

• Changed ngx_http_lua_ssl_psk_server_handler to use ssl_certificate_by_lua* instead of separate ssl_psk_by_lua*.

  

  Tuure Vartiainen

  committed
  c1f255b

  Copy full SHA for c1f255b

• Removed references to ssl_psk_by_lua*.

  

  Tuure Vartiainen

  committed
  2d2e9a4

  Copy full SHA for 2d2e9a4

• tests: Changed t/140-ssl-c-api.t TLS-PSK test to use ssl_certificate_by_lua_block instead of ssl_psk_by_lua_block.

  

  Tuure Vartiainen

  committed
  8fbbe24

  Copy full SHA for 8fbbe24

• doc: Removed references to ssl_psk_by_lua*.

  

  Tuure Vartiainen

  committed
  7fd69c3

  Copy full SHA for 7fd69c3

• bugfix: copy ctx->exit_code to cctx->exit_code in ngx_http_lua_ssl_cert_by_chunk.

  

  Tuure Vartiainen

  committed
  2ca05ce

  Copy full SHA for 2ca05ce

• This reverts commit 01055ca82044dd452b2a10b46f67850f0526473b

  

  Tuure Vartiainen

  committed
  7fff2b2

  Copy full SHA for 7fff2b2

• tests: Updated expected ciphers to match ones used by openresty.org in t/129-ssl-socket.t

  

  Tuure Vartiainen

  committed
  3353c6d

  Copy full SHA for 3353c6d

• tests: increased a timeout value of test 25 by one second in t/129-ssl-socket.t

  

  Tuure Vartiainen

  committed
  f1844c8

  Copy full SHA for f1844c8