Merge commit '2d8549ef17516e7eeb7da5d6498ecae3a2d0fab6' into dev

src/deps/src/lua-resty-openssl/.github/workflows/lint.yml

@@ -1,13 +1,17 @@
 name: Lint
 
 on:
-  push:
+ pull_request:
     paths:
       - lib/**.lua
-  pull_request:
+ push:
+    branches:
+    - master
+    - release/*
     paths:
       - lib/**.lua
 
+
 jobs:
   tests:
     name: Lint

src/deps/src/lua-resty-openssl/.github/workflows/tests.yml

@@ -50,14 +50,14 @@ jobs:
         - nginx: "1.25.3"
           openssl: "3.0.13"
           openssl_fips: "3.0.8"
-          extras: "valgrind perf"
+          extras: "valgrind perf lua-kong-nginx-module"
           lua_nginx_module: "v0.10.26"
           lua_resty_core: "v0.1.28"
           nginx_cc_opts: "-Wno-error"
         - nginx: "1.25.3"
           openssl: "3.1.5"
           openssl_fips: "3.0.8"
-          extras: "valgrind perf"
+          extras: "valgrind perf lua-kong-nginx-module"
           lua_nginx_module: "v0.10.26"
           lua_resty_core: "v0.1.28"
           nginx_cc_opts: "-Wno-error"

src/deps/src/lua-resty-openssl/CHANGELOG.md

@@ -2,6 +2,14 @@
 ## [Unreleased]
 
 
+<a name="1.3.1"></a>
+## [1.3.1] - 2024-04-22
+### bug fixes
+- **aux/jwk:** remove ecx.d if exporting as public key [9d34ff8](https://github.com/fffonion/lua-resty-openssl/commit/9d34ff8fd79debbcf155f74af0b161083b6a8385)
+- **aux/nginx:** fix the typo of get_socket_ssl in the stream module [0aa315e](https://github.com/fffonion/lua-resty-openssl/commit/0aa315efe3d98d38d8d77dedf687958b62d8b184)
+- **aux/nginx:** remove extra sanity test that prevent usage of lua-kong-nginx-module [7bd2d0a](https://github.com/fffonion/lua-resty-openssl/commit/7bd2d0aabe82219071fe9fd1b30e49ff88bd5472)
+
+
 <a name="1.3.0"></a>
 ## [1.3.0] - 2024-04-15
 ### features
@@ -583,7 +591,8 @@
 - **x509:** export pubkey [ede4f81](https://github.com/fffonion/lua-resty-openssl/commit/ede4f817cb0fe092ad6f9ab5d6ecdcde864a9fd8)
 
 
-[Unreleased]: https://github.com/fffonion/lua-resty-openssl/compare/1.3.0...HEAD
+[Unreleased]: https://github.com/fffonion/lua-resty-openssl/compare/1.3.1...HEAD
+[1.3.1]: https://github.com/fffonion/lua-resty-openssl/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/fffonion/lua-resty-openssl/compare/1.2.1...1.3.0
 [1.2.1]: https://github.com/fffonion/lua-resty-openssl/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/fffonion/lua-resty-openssl/compare/1.1.0...1.2.0

src/deps/src/lua-resty-openssl/lib/resty/openssl.lua

@@ -24,7 +24,7 @@ try_require_modules()
 
 
 local _M = {
-  _VERSION = '1.3.0',
+  _VERSION = '1.3.1',
 }
 
 function _M.load_modules()

src/deps/src/lua-resty-openssl/lib/resty/openssl/auxiliary/jwk.lua

@@ -245,9 +245,11 @@ function _M.dump_jwk(pkey, is_priv)
     jwk = {
       kty = "OKP",
       crv = ecx_curves_reverse[pkey.key_type],
-      d = encode_base64url(params.private),
       x = encode_base64url(params.public),
     }
+    if is_priv then
+      jwk.d = encode_base64url(params.private)
+    end
   else
     return nil, "jwk.dump_jwk: not implemented for this key type"
   end

src/deps/src/lua-resty-openssl/lib/resty/openssl/auxiliary/nginx_c.lua

@@ -56,14 +56,12 @@ if ngx.config.subsystem == "stream" then
         void **ssl_conn);
   ]]
 
-  -- sanity test
-  local _ = C.ngx_stream_lua_resty_openssl_aux_get_request_ssl
   local success
   if not os.getenv("CI_SKIP_KONG_SSL_FUNCS") then
     success, get_sock_ssl = pcall(function() return C.ngx_stream_lua_kong_get_socket_ssl end)
   end
   if not success or get_sock_ssl == nil then
-    get_sock_ssl = C.ngx_stream_lua_resty_openssl_aux_get_socket_ssl_ctx
+    get_sock_ssl = C.ngx_stream_lua_resty_openssl_aux_get_socket_ssl
   end
 
 else
@@ -87,8 +85,6 @@ else
         void **ssl_conn);
   ]]
 
-  -- sanity test
-  local _ = C.ngx_http_lua_resty_openssl_aux_get_request_ssl
   local success
   if not os.getenv("CI_SKIP_KONG_SSL_FUNCS") then
     success, get_sock_ssl = pcall(function() return C.ngx_http_lua_kong_ffi_get_socket_ssl end)

src/deps/src/lua-resty-openssl/lua-resty-openssl-1.3.1-1.rockspec

@@ -1,8 +1,8 @@
 package = "lua-resty-openssl"
-version = "1.3.0-1"
+version = "1.3.1-1"
 source = {
    url = "git+https://github.com/fffonion/lua-resty-openssl.git",
-   tag = "1.3.0"
+   tag = "1.3.1"
 }
 description = {
    detailed = "FFI-based OpenSSL binding for LuaJIT.",