From dead40ec6d1b5907f2803a6bb55f006dd27203ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= <tdiot@bunkerity.com>
Date: Thu, 23 Nov 2023 09:31:38 +0000
Subject: [PATCH] Squashed 'src/deps/src/lua-resty-openssl/' changes from
 89195843c..5aba923e7

5aba923e7 release: 1.0.2
c659347b3 fix(jwk) fix EC key dump parameters (#131)

git-subtree-dir: src/deps/src/lua-resty-openssl
git-subtree-split: 5aba923e78ae0f213f3b4719effa879e3971821f
---
 CHANGELOG.md                                             | 9 ++++++++-
 lib/resty/openssl.lua                                    | 2 +-
 lib/resty/openssl/auxiliary/jwk.lua                      | 2 +-
 ....0.1-1.rockspec => lua-resty-openssl-1.0.2-1.rockspec | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)
 rename lua-resty-openssl-1.0.1-1.rockspec => lua-resty-openssl-1.0.2-1.rockspec (99%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28cdecfb0..67ea9c876 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 ## [Unreleased]
 
 
+<a name="1.0.2"></a>
+## [1.0.2] - 2023-11-21
+### bug fixes
+- **jwk:** fix EC key dump parameters ([#131](https://github.com/fffonion/lua-resty-openssl/issues/131)) [c659347](https://github.com/fffonion/lua-resty-openssl/commit/c659347b356acfcb808ce659ae3094ba7fb2b9f1)
+
+
 <a name="1.0.1"></a>
 ## [1.0.1] - 2023-11-07
 ### bug fixes
@@ -542,7 +548,8 @@
 - **x509:** export pubkey [ede4f81](https://github.com/fffonion/lua-resty-openssl/commit/ede4f817cb0fe092ad6f9ab5d6ecdcde864a9fd8)
 
 
-[Unreleased]: https://github.com/fffonion/lua-resty-openssl/compare/1.0.1...HEAD
+[Unreleased]: https://github.com/fffonion/lua-resty-openssl/compare/1.0.2...HEAD
+[1.0.2]: https://github.com/fffonion/lua-resty-openssl/compare/1.0.1...1.0.2
 [1.0.1]: https://github.com/fffonion/lua-resty-openssl/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/fffonion/lua-resty-openssl/compare/0.8.26...1.0.0
 [0.8.26]: https://github.com/fffonion/lua-resty-openssl/compare/0.8.25...0.8.26
diff --git a/lib/resty/openssl.lua b/lib/resty/openssl.lua
index a4c1235ad..7bd9dcb55 100644
--- a/lib/resty/openssl.lua
+++ b/lib/resty/openssl.lua
@@ -24,7 +24,7 @@ try_require_modules()
 
 
 local _M = {
-  _VERSION = '1.0.1',
+  _VERSION = '1.0.2',
 }
 
 local libcrypto_name
diff --git a/lib/resty/openssl/auxiliary/jwk.lua b/lib/resty/openssl/auxiliary/jwk.lua
index a6518cda0..3738e99e0 100644
--- a/lib/resty/openssl/auxiliary/jwk.lua
+++ b/lib/resty/openssl/auxiliary/jwk.lua
@@ -231,7 +231,7 @@ function _M.dump_jwk(pkey, is_priv)
       kty = "EC",
       crv = ec_curves_reverse[params.group],
       x = b64.encode_base64url(params.x:to_binary()),
-      y = b64.encode_base64url(params.x:to_binary()),
+      y = b64.encode_base64url(params.y:to_binary()),
     }
     if is_priv then
       jwk.d = b64.encode_base64url(params.private:to_binary())
diff --git a/lua-resty-openssl-1.0.1-1.rockspec b/lua-resty-openssl-1.0.2-1.rockspec
similarity index 99%
rename from lua-resty-openssl-1.0.1-1.rockspec
rename to lua-resty-openssl-1.0.2-1.rockspec
index a435218dc..0413f006d 100644
--- a/lua-resty-openssl-1.0.1-1.rockspec
+++ b/lua-resty-openssl-1.0.2-1.rockspec
@@ -1,8 +1,8 @@
 package = "lua-resty-openssl"
-version = "1.0.1-1"
+version = "1.0.2-1"
 source = {
    url = "git+https://github.com/fffonion/lua-resty-openssl.git",
-   tag = "1.0.1"
+   tag = "1.0.2"
 }
 description = {
    detailed = "FFI-based OpenSSL binding for LuaJIT.",