From df082495633b06da6db2d6cd74cca4f8c49a3594 Mon Sep 17 00:00:00 2001
From: Leif Battermann <leif.battermann@wire.com>
Date: Tue, 28 Feb 2023 10:54:11 +0000
Subject: [PATCH 1/4] update to latest version of rusty-jwt-tools

---
 .../rusty_jwt_tools_ffi/add-Cargo.lock.patch  | 2378 ++++++++++++++---
 nix/pkgs/rusty_jwt_tools_ffi/default.nix      |   19 +-
 2 files changed, 2059 insertions(+), 338 deletions(-)

diff --git a/nix/pkgs/rusty_jwt_tools_ffi/add-Cargo.lock.patch b/nix/pkgs/rusty_jwt_tools_ffi/add-Cargo.lock.patch
index 5ac52f2aaf..9de4d963b0 100644
--- a/nix/pkgs/rusty_jwt_tools_ffi/add-Cargo.lock.patch
+++ b/nix/pkgs/rusty_jwt_tools_ffi/add-Cargo.lock.patch
@@ -1,41 +1,129 @@
-From 7d2af044a0a8d003936b5013defff915c4ca52dc Mon Sep 17 00:00:00 2001
+From 13a4229f8ae9f91f57a620a06aa1d6771aaad168 Mon Sep 17 00:00:00 2001
 From: Leif Battermann <leif.battermann@wire.com>
-Date: Tue, 13 Sep 2022 12:08:40 +0200
-Subject: [PATCH] cargo lock
+Date: Wed, 1 Mar 2023 15:27:03 +0100
+Subject: [PATCH] generate new cargo.lock
 
 ---
- .gitignore |    1 -
- Cargo.lock | 1279 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 1279 insertions(+), 1 deletion(-)
+ Cargo.lock | 3006 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 3006 insertions(+)
  create mode 100644 Cargo.lock
 
-diff --git a/.gitignore b/.gitignore
-index a178556..68bc967 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,7 +1,6 @@
- # Rust
- /target
- /debug
--/Cargo.lock
- 
- # Idea
- .idea
 diff --git a/Cargo.lock b/Cargo.lock
 new file mode 100644
-index 0000000..3f52488
+index 0000000..1e1537b
 --- /dev/null
 +++ b/Cargo.lock
-@@ -0,0 +1,1279 @@
+@@ -0,0 +1,3006 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
 +version = 3
 +
 +[[package]]
++name = "adler"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
++
++[[package]]
++name = "aho-corasick"
++version = "0.7.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "android_system_properties"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
++dependencies = [
++ "libc",
++]
++
++[[package]]
 +name = "anyhow"
-+version = "1.0.64"
++version = "1.0.69"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
++
++[[package]]
++name = "asn1-rs"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4"
++dependencies = [
++ "asn1-rs-derive",
++ "asn1-rs-impl",
++ "displaydoc",
++ "nom",
++ "num-traits",
++ "rusticata-macros",
++ "thiserror",
++ "time 0.3.20",
++]
++
++[[package]]
++name = "asn1-rs-derive"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "synstructure",
++]
++
++[[package]]
++name = "asn1-rs-impl"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "asserhttp"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "337b30b878c9c627e04044451ed6c2626dae094674b76d26807ea88e2ed03274"
++dependencies = [
++ "anyhow",
++ "assert-json-diff",
++ "futures-lite",
++ "http-types",
++ "regex",
++ "reqwest",
++ "serde",
++ "serde_json",
++ "tonic-build",
++]
++
++[[package]]
++name = "assert-json-diff"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
++dependencies = [
++ "serde",
++ "serde_json",
++]
++
++[[package]]
++name = "async-channel"
++version = "1.8.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7"
++checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
++dependencies = [
++ "concurrent-queue",
++ "event-listener",
++ "futures-core",
++]
 +
 +[[package]]
 +name = "autocfg"
@@ -51,15 +139,21 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "base64"
-+version = "0.13.0"
++version = "0.13.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
++
++[[package]]
++name = "base64"
++version = "0.21.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
++checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
 +
 +[[package]]
 +name = "base64ct"
-+version = "1.5.2"
++version = "1.6.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474"
++checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 +
 +[[package]]
 +name = "binstring"
@@ -68,6 +162,23 @@ index 0000000..3f52488
 +checksum = "7e0d60973d9320722cb1206f412740e162a33b8547ea8d6be75d7cff237c7a85"
 +
 +[[package]]
++name = "biscuit"
++version = "0.6.0-beta1"
++source = "git+https://github.com/beltram/biscuit?tag=v0.6.0-pre.core-crypto-0.6.0#36b6f30964142f0ca5bc17c908e8b2ad78febaf6"
++dependencies = [
++ "base64 0.21.0",
++ "chrono",
++ "data-encoding",
++ "num-bigint",
++ "num-traits",
++ "once_cell",
++ "rand 0.8.5",
++ "ring 0.17.0-not-released-yet",
++ "serde",
++ "serde_json",
++]
++
++[[package]]
 +name = "bitflags"
 +version = "1.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -83,10 +194,21 @@ index 0000000..3f52488
 +]
 +
 +[[package]]
++name = "bollard-stubs"
++version = "1.41.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8"
++dependencies = [
++ "chrono",
++ "serde",
++ "serde_with",
++]
++
++[[package]]
 +name = "bumpalo"
-+version = "3.11.0"
++version = "3.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
++checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 +
 +[[package]]
 +name = "byteorder"
@@ -95,24 +217,121 @@ index 0000000..3f52488
 +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 +
 +[[package]]
++name = "bytes"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
++
++[[package]]
++name = "cc"
++version = "1.0.79"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
++
++[[package]]
 +name = "cfg-if"
 +version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 +
 +[[package]]
++name = "chrono"
++version = "0.4.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
++dependencies = [
++ "iana-time-zone",
++ "js-sys",
++ "num-integer",
++ "num-traits",
++ "serde",
++ "time 0.1.45",
++ "wasm-bindgen",
++ "winapi",
++]
++
++[[package]]
++name = "clap"
++version = "4.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
++dependencies = [
++ "bitflags",
++ "clap_derive",
++ "clap_lex",
++ "is-terminal",
++ "once_cell",
++ "strsim",
++ "termcolor",
++]
++
++[[package]]
++name = "clap_derive"
++version = "4.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0"
++dependencies = [
++ "heck",
++ "proc-macro-error",
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "clap_lex"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
++dependencies = [
++ "os_str_bytes",
++]
++
++[[package]]
 +name = "coarsetime"
-+version = "0.1.22"
++version = "0.1.23"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46"
++checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354"
 +dependencies = [
 + "libc",
 + "once_cell",
-+ "wasi",
++ "wasi 0.11.0+wasi-snapshot-preview1",
 + "wasm-bindgen",
 +]
 +
 +[[package]]
++name = "codespan-reporting"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
++dependencies = [
++ "termcolor",
++ "unicode-width",
++]
++
++[[package]]
++name = "concurrent-queue"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
++dependencies = [
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "console"
++version = "0.15.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60"
++dependencies = [
++ "encode_unicode",
++ "lazy_static",
++ "libc",
++ "unicode-width",
++ "windows-sys 0.42.0",
++]
++
++[[package]]
 +name = "console_error_panic_hook"
 +version = "0.1.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -124,15 +343,21 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "const-oid"
-+version = "0.7.1"
++version = "0.9.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
++checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
 +
 +[[package]]
-+name = "const-oid"
-+version = "0.9.0"
++name = "convert_case"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
++
++[[package]]
++name = "core-foundation-sys"
++version = "0.8.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661"
++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 +
 +[[package]]
 +name = "cpufeatures"
@@ -144,23 +369,31 @@ index 0000000..3f52488
 +]
 +
 +[[package]]
-+name = "crypto-bigint"
-+version = "0.3.2"
++name = "crc32fast"
++version = "1.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 +dependencies = [
-+ "generic-array",
-+ "subtle",
++ "cfg-if",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.8.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
++dependencies = [
++ "cfg-if",
 +]
 +
 +[[package]]
 +name = "crypto-bigint"
-+version = "0.4.8"
++version = "0.4.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9f2b443d17d49dad5ef0ede301c3179cc923b8822f3393b4d2c28c269dd4a122"
++checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 +dependencies = [
 + "generic-array",
-+ "rand_core",
++ "rand_core 0.6.4",
 + "subtle",
 + "zeroize",
 +]
@@ -182,58 +415,180 @@ index 0000000..3f52488
 +checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df"
 +
 +[[package]]
-+name = "der"
-+version = "0.5.1"
++name = "cxx"
++version = "1.0.91"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62"
++dependencies = [
++ "cc",
++ "cxxbridge-flags",
++ "cxxbridge-macro",
++ "link-cplusplus",
++]
++
++[[package]]
++name = "cxx-build"
++version = "1.0.91"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690"
++dependencies = [
++ "cc",
++ "codespan-reporting",
++ "once_cell",
++ "proc-macro2",
++ "quote",
++ "scratch",
++ "syn",
++]
++
++[[package]]
++name = "cxxbridge-flags"
++version = "1.0.91"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf"
++
++[[package]]
++name = "cxxbridge-macro"
++version = "1.0.91"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "darling"
++version = "0.13.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
++dependencies = [
++ "darling_core",
++ "darling_macro",
++]
++
++[[package]]
++name = "darling_core"
++version = "0.13.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
++dependencies = [
++ "fnv",
++ "ident_case",
++ "proc-macro2",
++ "quote",
++ "strsim",
++ "syn",
++]
++
++[[package]]
++name = "darling_macro"
++version = "0.13.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
++checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 +dependencies = [
-+ "const-oid 0.7.1",
-+ "crypto-bigint 0.3.2",
-+ "pem-rfc7468 0.3.1",
++ "darling_core",
++ "quote",
++ "syn",
 +]
 +
 +[[package]]
++name = "data-encoding"
++version = "2.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
++
++[[package]]
 +name = "der"
-+version = "0.6.0"
++version = "0.6.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f"
++checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
 +dependencies = [
-+ "const-oid 0.9.0",
-+ "pem-rfc7468 0.6.0",
++ "const-oid",
++ "pem-rfc7468",
 + "zeroize",
 +]
 +
 +[[package]]
++name = "der-parser"
++version = "8.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1"
++dependencies = [
++ "asn1-rs",
++ "displaydoc",
++ "nom",
++ "num-bigint",
++ "num-traits",
++ "rusticata-macros",
++]
++
++[[package]]
++name = "derive_more"
++version = "0.99.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
++dependencies = [
++ "convert_case",
++ "proc-macro2",
++ "quote",
++ "rustc_version",
++ "syn",
++]
++
++[[package]]
 +name = "digest"
-+version = "0.10.3"
++version = "0.10.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
++checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
 +dependencies = [
 + "block-buffer",
++ "const-oid",
 + "crypto-common",
 + "subtle",
 +]
 +
 +[[package]]
++name = "displaydoc"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
 +name = "ecdsa"
-+version = "0.14.5"
++version = "0.15.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1826508d57f3140a2e8e3c307b19915a266c92a1b8c2f6bb54e29e5d72a394ae"
++checksum = "12844141594ad74185a926d030f3b605f6a903b4e3fec351f3ea338ac5b7637e"
 +dependencies = [
-+ "der 0.6.0",
++ "der",
 + "elliptic-curve",
 + "rfc6979",
-+ "signature",
++ "signature 2.0.0",
 +]
 +
 +[[package]]
 +name = "ed25519-compact"
-+version = "1.0.11"
++version = "2.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "24e1f30f0312ac83726c1197abeacd91c9557f8a623e904a009ae6bc529ae8d8"
++checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c"
 +dependencies = [
 + "ct-codecs",
-+ "getrandom",
++ "getrandom 0.2.8",
++]
++
++[[package]]
++name = "either"
++version = "1.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
++dependencies = [
++ "serde",
 +]
 +
 +[[package]]
@@ -243,50 +598,135 @@ index 0000000..3f52488
 +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
 +dependencies = [
 + "base16ct",
-+ "base64ct",
-+ "crypto-bigint 0.4.8",
-+ "der 0.6.0",
++ "crypto-bigint",
++ "der",
 + "digest",
 + "ff",
 + "generic-array",
 + "group",
 + "hkdf",
-+ "pem-rfc7468 0.6.0",
-+ "pkcs8 0.9.0",
-+ "rand_core",
++ "pem-rfc7468",
++ "pkcs8",
++ "rand_core 0.6.4",
 + "sec1",
-+ "serde_json",
-+ "serdect",
 + "subtle",
 + "zeroize",
 +]
 +
 +[[package]]
-+name = "ff"
-+version = "0.12.0"
++name = "encode_unicode"
++version = "0.3.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "df689201f395c6b90dfe87127685f8dbfc083a5e779e613575d8bd7314300c3e"
-+dependencies = [
-+ "rand_core",
-+ "subtle",
-+]
++checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 +
 +[[package]]
-+name = "fluvio-wasm-timer"
-+version = "0.2.5"
++name = "encoding_rs"
++version = "0.8.32"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b768c170dc045fa587a8f948c91f9bcfb87f774930477c6215addf54317f137f"
++checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
 +dependencies = [
-+ "futures",
-+ "js-sys",
-+ "parking_lot",
-+ "pin-utils",
-+ "wasm-bindgen",
-+ "wasm-bindgen-futures",
-+ "web-sys",
++ "cfg-if",
 +]
 +
 +[[package]]
++name = "errno"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
++dependencies = [
++ "errno-dragonfly",
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "errno-dragonfly"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
++dependencies = [
++ "cc",
++ "libc",
++]
++
++[[package]]
++name = "event-listener"
++version = "2.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
++
++[[package]]
++name = "fastrand"
++version = "1.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
++dependencies = [
++ "instant",
++]
++
++[[package]]
++name = "ff"
++version = "0.12.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
++dependencies = [
++ "rand_core 0.6.4",
++ "subtle",
++]
++
++[[package]]
++name = "fixedbitset"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
++
++[[package]]
++name = "flate2"
++version = "1.0.25"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
++dependencies = [
++ "crc32fast",
++ "miniz_oxide",
++]
++
++[[package]]
++name = "fluvio-wasm-timer"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b768c170dc045fa587a8f948c91f9bcfb87f774930477c6215addf54317f137f"
++dependencies = [
++ "futures",
++ "js-sys",
++ "parking_lot",
++ "pin-utils",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "web-sys",
++]
++
++[[package]]
++name = "fnv"
++version = "1.0.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
++
++[[package]]
++name = "foreign-types"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
++dependencies = [
++ "foreign-types-shared",
++]
++
++[[package]]
++name = "foreign-types-shared"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
++
++[[package]]
 +name = "form_urlencoded"
 +version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -297,9 +737,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "futures"
-+version = "0.3.24"
++version = "0.3.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
++checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
 +dependencies = [
 + "futures-channel",
 + "futures-core",
@@ -312,9 +752,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "futures-channel"
-+version = "0.3.24"
++version = "0.3.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
++checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
 +dependencies = [
 + "futures-core",
 + "futures-sink",
@@ -322,15 +762,15 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "futures-core"
-+version = "0.3.24"
++version = "0.3.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
++checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
 +
 +[[package]]
 +name = "futures-executor"
-+version = "0.3.24"
++version = "0.3.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
++checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
 +dependencies = [
 + "futures-core",
 + "futures-task",
@@ -339,15 +779,30 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "futures-io"
-+version = "0.3.24"
++version = "0.3.26"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
++
++[[package]]
++name = "futures-lite"
++version = "1.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
++checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
++dependencies = [
++ "fastrand",
++ "futures-core",
++ "futures-io",
++ "memchr",
++ "parking",
++ "pin-project-lite",
++ "waker-fn",
++]
 +
 +[[package]]
 +name = "futures-macro"
-+version = "0.3.24"
++version = "0.3.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
++checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
 +dependencies = [
 + "proc-macro2",
 + "quote",
@@ -356,15 +811,15 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "futures-sink"
-+version = "0.3.24"
++version = "0.3.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
++checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
 +
 +[[package]]
 +name = "futures-task"
-+version = "0.3.24"
++version = "0.3.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
++checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
 +
 +[[package]]
 +name = "futures-timer"
@@ -374,9 +829,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "futures-util"
-+version = "0.3.24"
++version = "0.3.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
++checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
 +dependencies = [
 + "futures-channel",
 + "futures-core",
@@ -402,29 +857,92 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.2.7"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "wasi 0.9.0+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.2.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
++checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 +dependencies = [
 + "cfg-if",
 + "js-sys",
 + "libc",
-+ "wasi",
++ "wasi 0.11.0+wasi-snapshot-preview1",
 + "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "group"
-+version = "0.12.0"
++version = "0.12.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d"
++checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 +dependencies = [
 + "ff",
-+ "rand_core",
++ "rand_core 0.6.4",
 + "subtle",
 +]
 +
 +[[package]]
++name = "h2"
++version = "0.3.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
++dependencies = [
++ "bytes",
++ "fnv",
++ "futures-core",
++ "futures-sink",
++ "futures-util",
++ "http",
++ "indexmap",
++ "slab",
++ "tokio",
++ "tokio-util",
++ "tracing",
++]
++
++[[package]]
++name = "hashbrown"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
++
++[[package]]
++name = "heck"
++version = "0.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
++
++[[package]]
++name = "hermit-abi"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "hermit-abi"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
++
++[[package]]
++name = "hex"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
++
++[[package]]
 +name = "hkdf"
 +version = "0.12.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -444,29 +962,150 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "hmac-sha1-compact"
-+version = "1.1.1"
++version = "1.1.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d103cfecf6edf3f7d1dc7c5ab64e99488c0f8d11786e43b40873e66e8489d014"
++checksum = "05e2440a0078e20c3b68ca01234cea4219f23e64b0c0bdb1200c5550d54239bb"
 +
 +[[package]]
 +name = "hmac-sha256"
-+version = "1.1.4"
++version = "1.1.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fd29dbba58ee5314f3ec570066d78a3f4772bf45b322efcf2ce2a43af69a4d85"
++checksum = "fc736091aacb31ddaa4cd5f6988b3c21e99913ac846b41f32538c5fae5d71bfe"
 +dependencies = [
 + "digest",
 +]
 +
 +[[package]]
 +name = "hmac-sha512"
-+version = "1.1.2"
++version = "1.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a928b002dff1780b7fa21056991d395770ab9359154b8c1724c4d0511dad0a65"
++checksum = "520c9c3f6040661669bc5c91e551b605a520c8e0a63a766a91a65adef734d151"
 +dependencies = [
 + "digest",
 +]
 +
 +[[package]]
++name = "http"
++version = "0.2.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
++dependencies = [
++ "bytes",
++ "fnv",
++ "itoa",
++]
++
++[[package]]
++name = "http-body"
++version = "0.4.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
++dependencies = [
++ "bytes",
++ "http",
++ "pin-project-lite",
++]
++
++[[package]]
++name = "http-types"
++version = "2.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
++dependencies = [
++ "anyhow",
++ "async-channel",
++ "base64 0.13.1",
++ "futures-lite",
++ "infer",
++ "pin-project-lite",
++ "rand 0.7.3",
++ "serde",
++ "serde_json",
++ "serde_qs",
++ "serde_urlencoded",
++ "url",
++]
++
++[[package]]
++name = "httparse"
++version = "1.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
++
++[[package]]
++name = "httpdate"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
++
++[[package]]
++name = "hyper"
++version = "0.14.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
++dependencies = [
++ "bytes",
++ "futures-channel",
++ "futures-core",
++ "futures-util",
++ "h2",
++ "http",
++ "http-body",
++ "httparse",
++ "httpdate",
++ "itoa",
++ "pin-project-lite",
++ "socket2",
++ "tokio",
++ "tower-service",
++ "tracing",
++ "want",
++]
++
++[[package]]
++name = "hyper-rustls"
++version = "0.23.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
++dependencies = [
++ "http",
++ "hyper",
++ "rustls",
++ "tokio",
++ "tokio-rustls",
++]
++
++[[package]]
++name = "iana-time-zone"
++version = "0.1.53"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
++dependencies = [
++ "android_system_properties",
++ "core-foundation-sys",
++ "iana-time-zone-haiku",
++ "js-sys",
++ "wasm-bindgen",
++ "winapi",
++]
++
++[[package]]
++name = "iana-time-zone-haiku"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
++dependencies = [
++ "cxx",
++ "cxx-build",
++]
++
++[[package]]
++name = "ident_case"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
++
++[[package]]
 +name = "idna"
 +version = "0.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -477,6 +1116,22 @@ index 0000000..3f52488
 +]
 +
 +[[package]]
++name = "indexmap"
++version = "1.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
++dependencies = [
++ "autocfg",
++ "hashbrown",
++]
++
++[[package]]
++name = "infer"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
++
++[[package]]
 +name = "instant"
 +version = "0.1.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -489,24 +1144,91 @@ index 0000000..3f52488
 +]
 +
 +[[package]]
++name = "io-lifetimes"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
++dependencies = [
++ "libc",
++ "windows-sys 0.45.0",
++]
++
++[[package]]
++name = "ipnet"
++version = "2.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
++
++[[package]]
++name = "is-terminal"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
++dependencies = [
++ "hermit-abi 0.3.1",
++ "io-lifetimes",
++ "rustix",
++ "windows-sys 0.45.0",
++]
++
++[[package]]
++name = "itertools"
++version = "0.10.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
++dependencies = [
++ "either",
++]
++
++[[package]]
 +name = "itoa"
-+version = "1.0.3"
++version = "1.0.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
++checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
++
++[[package]]
++name = "josekit"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ef871a7a5f162afa718c416e9cbdd54241a58c922e07870e898ebad2425d8d8"
++dependencies = [
++ "anyhow",
++ "base64 0.13.1",
++ "flate2",
++ "once_cell",
++ "openssl",
++ "regex",
++ "serde",
++ "serde_json",
++ "thiserror",
++ "time 0.3.20",
++]
 +
 +[[package]]
 +name = "js-sys"
-+version = "0.3.59"
++version = "0.3.61"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
++checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
 +dependencies = [
 + "wasm-bindgen",
 +]
 +
 +[[package]]
++name = "json-patch"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e712e62827c382a77b87f590532febb1f8b2fdbc3eefa1ee37fe7281687075ef"
++dependencies = [
++ "serde",
++ "serde_json",
++ "thiserror",
++ "treediff",
++]
++
++[[package]]
 +name = "jwt-simple"
-+version = "0.10.0"
-+source = "git+https://github.com/beltram/rust-jwt-simple?branch=master#e05b2875285a79ee8e06639d21fde827466ec2cb"
++version = "0.11.3"
++source = "git+https://github.com/wireapp/rust-jwt-simple?tag=v0.11.3-pre.core-crypto-0.6.0#15a69f82288d68b74a75c1364e5d4bf681f1c07b"
 +dependencies = [
 + "anyhow",
 + "binstring",
@@ -519,25 +1241,27 @@ index 0000000..3f52488
 + "k256",
 + "p256",
 + "p384",
-+ "rand",
++ "rand 0.8.5",
 + "rsa",
 + "serde",
 + "serde_json",
-+ "spki 0.5.4",
++ "spki",
 + "thiserror",
 + "zeroize",
 +]
 +
 +[[package]]
 +name = "k256"
-+version = "0.11.4"
++version = "0.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6db2573d3fd3e4cc741affc9b5ce1a8ce36cf29f09f80f36da4309d0ae6d7854"
++checksum = "92a55e0ff3b72c262bcf041d9e97f1b84492b68f1c1a384de2323d3dc9403397"
 +dependencies = [
 + "cfg-if",
 + "ecdsa",
 + "elliptic-curve",
++ "once_cell",
 + "sha2",
++ "signature 2.0.0",
 +]
 +
 +[[package]]
@@ -546,26 +1270,41 @@ index 0000000..3f52488
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 +dependencies = [
-+ "spin",
++ "spin 0.5.2",
 +]
 +
 +[[package]]
 +name = "libc"
-+version = "0.2.132"
++version = "0.2.139"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
++checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 +
 +[[package]]
 +name = "libm"
-+version = "0.2.5"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
++
++[[package]]
++name = "link-cplusplus"
++version = "1.0.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
++dependencies = [
++ "cc",
++]
++
++[[package]]
++name = "linux-raw-sys"
++version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565"
++checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 +
 +[[package]]
 +name = "lock_api"
-+version = "0.4.8"
++version = "0.4.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
++checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 +dependencies = [
 + "autocfg",
 + "scopeguard",
@@ -587,24 +1326,84 @@ index 0000000..3f52488
 +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 +
 +[[package]]
-+name = "num-bigint-dig"
-+version = "0.8.1"
++name = "mime"
++version = "0.3.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
++
++[[package]]
++name = "minimal-lexical"
++version = "0.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "566d173b2f9406afbc5510a90925d5a2cd80cae4605631f1212303df265de011"
++checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
++
++[[package]]
++name = "miniz_oxide"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
 +dependencies = [
-+ "byteorder",
-+ "lazy_static",
-+ "libm",
-+ "num-integer",
-+ "num-iter",
-+ "num-traits",
-+ "rand",
-+ "smallvec",
-+ "zeroize",
++ "adler",
 +]
 +
 +[[package]]
-+name = "num-integer"
++name = "mio"
++version = "0.8.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
++dependencies = [
++ "libc",
++ "log",
++ "wasi 0.11.0+wasi-snapshot-preview1",
++ "windows-sys 0.45.0",
++]
++
++[[package]]
++name = "multimap"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
++
++[[package]]
++name = "nom"
++version = "7.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
++dependencies = [
++ "memchr",
++ "minimal-lexical",
++]
++
++[[package]]
++name = "num-bigint"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
++dependencies = [
++ "autocfg",
++ "num-integer",
++ "num-traits",
++]
++
++[[package]]
++name = "num-bigint-dig"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905"
++dependencies = [
++ "byteorder",
++ "lazy_static",
++ "libm",
++ "num-integer",
++ "num-iter",
++ "num-traits",
++ "rand 0.8.5",
++ "smallvec",
++ "zeroize",
++]
++
++[[package]]
++name = "num-integer"
 +version = "0.1.45"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
@@ -635,34 +1434,106 @@ index 0000000..3f52488
 +]
 +
 +[[package]]
++name = "num_cpus"
++version = "1.15.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
++dependencies = [
++ "hermit-abi 0.2.6",
++ "libc",
++]
++
++[[package]]
++name = "oid-registry"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
++dependencies = [
++ "asn1-rs",
++]
++
++[[package]]
 +name = "once_cell"
-+version = "1.14.0"
++version = "1.17.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
++checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
++
++[[package]]
++name = "openssl"
++version = "0.10.45"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
++dependencies = [
++ "bitflags",
++ "cfg-if",
++ "foreign-types",
++ "libc",
++ "once_cell",
++ "openssl-macros",
++ "openssl-sys",
++]
++
++[[package]]
++name = "openssl-macros"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "openssl-sys"
++version = "0.9.80"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
++dependencies = [
++ "autocfg",
++ "cc",
++ "libc",
++ "pkg-config",
++ "vcpkg",
++]
++
++[[package]]
++name = "os_str_bytes"
++version = "6.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
 +
 +[[package]]
 +name = "p256"
-+version = "0.11.1"
++version = "0.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
++checksum = "49c124b3cbce43bcbac68c58ec181d98ed6cc7e6d0aa7c3ba97b2563410b0e55"
 +dependencies = [
 + "ecdsa",
 + "elliptic-curve",
++ "primeorder",
 + "sha2",
 +]
 +
 +[[package]]
 +name = "p384"
-+version = "0.11.2"
++version = "0.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
++checksum = "630a4a9b2618348ececfae61a4905f564b817063bf2d66cdfc2ced523fe1d2d4"
 +dependencies = [
 + "ecdsa",
 + "elliptic-curve",
++ "primeorder",
 + "sha2",
 +]
 +
 +[[package]]
++name = "parking"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
++
++[[package]]
 +name = "parking_lot"
 +version = "0.11.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -675,9 +1546,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "parking_lot_core"
-+version = "0.8.5"
++version = "0.8.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
++checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
 +dependencies = [
 + "cfg-if",
 + "instant",
@@ -688,12 +1559,12 @@ index 0000000..3f52488
 +]
 +
 +[[package]]
-+name = "pem-rfc7468"
-+version = "0.3.1"
++name = "pem"
++version = "1.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30"
++checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
 +dependencies = [
-+ "base64ct",
++ "base64 0.13.1",
 +]
 +
 +[[package]]
@@ -712,6 +1583,16 @@ index 0000000..3f52488
 +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 +
 +[[package]]
++name = "petgraph"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
++dependencies = [
++ "fixedbitset",
++ "indexmap",
++]
++
++[[package]]
 +name = "pin-project-lite"
 +version = "0.2.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -725,69 +1606,185 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "pkcs1"
-+version = "0.3.3"
++version = "0.4.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320"
++checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719"
 +dependencies = [
-+ "der 0.5.1",
-+ "pkcs8 0.8.0",
++ "der",
++ "pkcs8",
++ "spki",
 + "zeroize",
 +]
 +
 +[[package]]
 +name = "pkcs8"
-+version = "0.8.0"
++version = "0.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
++checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
 +dependencies = [
-+ "der 0.5.1",
-+ "spki 0.5.4",
-+ "zeroize",
++ "der",
++ "spki",
 +]
 +
 +[[package]]
-+name = "pkcs8"
-+version = "0.9.0"
++name = "pkg-config"
++version = "0.3.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
++checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
++
++[[package]]
++name = "prettyplease"
++version = "0.1.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78"
 +dependencies = [
-+ "der 0.6.0",
-+ "spki 0.6.0",
++ "proc-macro2",
++ "syn",
 +]
 +
 +[[package]]
-+name = "ppv-lite86"
-+version = "0.2.16"
++name = "primeorder"
++version = "0.12.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
++checksum = "0b54f7131b3dba65a2f414cf5bd25b66d4682e4608610668eae785750ba4c5b2"
++dependencies = [
++ "elliptic-curve",
++]
++
++[[package]]
++name = "proc-macro-error"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
++dependencies = [
++ "proc-macro-error-attr",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "version_check",
++]
++
++[[package]]
++name = "proc-macro-error-attr"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "version_check",
++]
 +
 +[[package]]
 +name = "proc-macro2"
-+version = "1.0.43"
++version = "1.0.51"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
++checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
 +dependencies = [
 + "unicode-ident",
 +]
 +
 +[[package]]
++name = "prost"
++version = "0.11.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537"
++dependencies = [
++ "bytes",
++ "prost-derive",
++]
++
++[[package]]
++name = "prost-build"
++version = "0.11.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12"
++dependencies = [
++ "bytes",
++ "heck",
++ "itertools",
++ "lazy_static",
++ "log",
++ "multimap",
++ "petgraph",
++ "prettyplease",
++ "prost",
++ "prost-types",
++ "regex",
++ "syn",
++ "tempfile",
++ "which",
++]
++
++[[package]]
++name = "prost-derive"
++version = "0.11.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b"
++dependencies = [
++ "anyhow",
++ "itertools",
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "prost-types"
++version = "0.11.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88"
++dependencies = [
++ "prost",
++]
++
++[[package]]
 +name = "quote"
-+version = "1.0.21"
++version = "1.0.23"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
++checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 +dependencies = [
 + "proc-macro2",
 +]
 +
 +[[package]]
 +name = "rand"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++dependencies = [
++ "getrandom 0.1.16",
++ "libc",
++ "rand_chacha 0.2.2",
++ "rand_core 0.5.1",
++ "rand_hc",
++]
++
++[[package]]
++name = "rand"
 +version = "0.8.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 +dependencies = [
 + "libc",
-+ "rand_chacha",
-+ "rand_core",
++ "rand_chacha 0.3.1",
++ "rand_core 0.6.4",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
++dependencies = [
++ "ppv-lite86",
++ "rand_core 0.5.1",
 +]
 +
 +[[package]]
@@ -797,16 +1794,45 @@ index 0000000..3f52488
 +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 +dependencies = [
 + "ppv-lite86",
-+ "rand_core",
++ "rand_core 0.6.4",
 +]
 +
 +[[package]]
 +name = "rand_core"
-+version = "0.6.3"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++dependencies = [
++ "getrandom 0.1.16",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.6.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
++dependencies = [
++ "getrandom 0.2.8",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 +dependencies = [
-+ "getrandom",
++ "rand_core 0.5.1",
++]
++
++[[package]]
++name = "rcgen"
++version = "0.9.2"
++source = "git+https://github.com/wireapp/rcgen?tag=v1.2.0-pre.core-crypto-0.6.0#1e893c3444a9a1625dc8f3fe7be6df025f64646a"
++dependencies = [
++ "pem",
++ "ring 0.17.0-not-released-yet",
++ "time 0.3.20",
++ "yasna",
 +]
 +
 +[[package]]
@@ -819,21 +1845,104 @@ index 0000000..3f52488
 +]
 +
 +[[package]]
++name = "regex"
++version = "1.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.28"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
++
++[[package]]
++name = "reqwest"
++version = "0.11.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9"
++dependencies = [
++ "base64 0.21.0",
++ "bytes",
++ "encoding_rs",
++ "futures-core",
++ "futures-util",
++ "h2",
++ "http",
++ "http-body",
++ "hyper",
++ "hyper-rustls",
++ "ipnet",
++ "js-sys",
++ "log",
++ "mime",
++ "once_cell",
++ "percent-encoding",
++ "pin-project-lite",
++ "rustls",
++ "rustls-pemfile",
++ "serde",
++ "serde_json",
++ "serde_urlencoded",
++ "tokio",
++ "tokio-rustls",
++ "tower-service",
++ "url",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "web-sys",
++ "winreg",
++]
++
++[[package]]
 +name = "rfc6979"
-+version = "0.3.0"
++version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "88c86280f057430a52f4861551b092a01b419b8eacefc7c995eacb9dc132fe32"
++checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
 +dependencies = [
-+ "crypto-bigint 0.4.8",
++ "crypto-bigint",
 + "hmac",
 + "zeroize",
 +]
 +
 +[[package]]
++name = "ring"
++version = "0.16.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
++dependencies = [
++ "cc",
++ "libc",
++ "once_cell",
++ "spin 0.5.2",
++ "untrusted 0.7.1",
++ "web-sys",
++ "winapi",
++]
++
++[[package]]
++name = "ring"
++version = "0.17.0-not-released-yet"
++source = "git+https://github.com/briansmith/ring.git?rev=450ada28#450ada288f1805795140097ec96396b890bcf722"
++dependencies = [
++ "cc",
++ "getrandom 0.2.8",
++ "libc",
++ "spin 0.9.5",
++ "untrusted 0.9.0",
++ "winapi",
++]
++
++[[package]]
 +name = "rsa"
-+version = "0.6.1"
++version = "0.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b"
++checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c"
 +dependencies = [
 + "byteorder",
 + "digest",
@@ -842,8 +1951,9 @@ index 0000000..3f52488
 + "num-iter",
 + "num-traits",
 + "pkcs1",
-+ "pkcs8 0.8.0",
-+ "rand_core",
++ "pkcs8",
++ "rand_core 0.6.4",
++ "signature 1.6.4",
 + "smallvec",
 + "subtle",
 + "zeroize",
@@ -851,9 +1961,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "rstest"
-+version = "0.15.0"
++version = "0.16.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e9c9dc66cc29792b663ffb5269be669f1613664e69ad56441fdb895c2347b930"
++checksum = "b07f2d176c472198ec1e6551dc7da28f1c089652f66a7b722676c2238ebc0edf"
 +dependencies = [
 + "futures",
 + "futures-timer",
@@ -863,24 +1973,26 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "rstest_macros"
-+version = "0.14.0"
++version = "0.16.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5015e68a0685a95ade3eee617ff7101ab6a3fc689203101ca16ebc16f2b89c66"
++checksum = "7229b505ae0706e64f37ffc54a9c163e11022a6636d58fe1f3f52018257ff9f7"
 +dependencies = [
 + "cfg-if",
 + "proc-macro2",
 + "quote",
 + "rustc_version",
 + "syn",
++ "unicode-ident",
 +]
 +
 +[[package]]
 +name = "rstest_reuse"
-+version = "0.4.0"
++version = "0.5.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f9b5aed35457441e7e0db509695ba3932d4c47e046777141c167efe584d0ec17"
++checksum = "45f80dcc84beab3a327bbe161f77db25f336a1452428176787c8c79ac79d7073"
 +dependencies = [
 + "quote",
++ "rand 0.8.5",
 + "rustc_version",
 + "syn",
 +]
@@ -895,89 +2007,418 @@ index 0000000..3f52488
 +]
 +
 +[[package]]
++name = "rusticata-macros"
++version = "4.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
++dependencies = [
++ "nom",
++]
++
++[[package]]
++name = "rustix"
++version = "0.36.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
++dependencies = [
++ "bitflags",
++ "errno",
++ "io-lifetimes",
++ "libc",
++ "linux-raw-sys",
++ "windows-sys 0.45.0",
++]
++
++[[package]]
++name = "rustls"
++version = "0.20.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
++dependencies = [
++ "log",
++ "ring 0.16.20",
++ "sct",
++ "webpki",
++]
++
++[[package]]
++name = "rustls-pemfile"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
++dependencies = [
++ "base64 0.21.0",
++]
++
++[[package]]
++name = "rusty-acme"
++version = "0.2.0"
++dependencies = [
++ "base64 0.21.0",
++ "jwt-simple",
++ "rcgen",
++ "reqwest",
++ "rusty-jwt-tools",
++ "serde",
++ "serde_json",
++ "testcontainers",
++ "thiserror",
++ "time 0.3.20",
++ "url",
++ "wasm-bindgen-test",
++ "x509-parser",
++]
++
++[[package]]
++name = "rusty-jwt-cli"
++version = "0.2.0"
++dependencies = [
++ "anyhow",
++ "clap",
++ "console",
++ "jwt-simple",
++ "rusty-jwt-tools",
++ "serde_json",
++]
++
++[[package]]
 +name = "rusty-jwt-tools"
-+version = "0.1.0"
++version = "0.2.0"
 +dependencies = [
-+ "base64",
++ "base64 0.21.0",
++ "biscuit",
++ "chrono",
 + "ed25519-compact",
-+ "elliptic-curve",
++ "either",
 + "fluvio-wasm-timer",
-+ "getrandom",
++ "indexmap",
++ "josekit",
++ "json-patch",
 + "jwt-simple",
 + "p256",
 + "p384",
-+ "rand",
++ "rand 0.8.5",
++ "rand_chacha 0.3.1",
++ "reqwest",
 + "rstest",
 + "rstest_reuse",
++ "sec1",
 + "serde",
 + "serde_json",
++ "sha2",
 + "thiserror",
++ "time 0.3.20",
 + "url",
 + "uuid",
 + "wasm-bindgen-test",
++ "zeroize",
 +]
 +
 +[[package]]
 +name = "rusty-jwt-tools-ffi"
-+version = "0.1.0"
++version = "0.2.0"
 +dependencies = [
-+ "cfg-if",
 + "rusty-jwt-tools",
++ "uuid",
 +]
 +
 +[[package]]
 +name = "ryu"
-+version = "1.0.11"
++version = "1.0.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
++checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
++
++[[package]]
++name = "scoped-tls"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
++
++[[package]]
++name = "scopeguard"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
++
++[[package]]
++name = "scratch"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
++
++[[package]]
++name = "sct"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
++dependencies = [
++ "ring 0.16.20",
++ "untrusted 0.7.1",
++]
++
++[[package]]
++name = "sec1"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
++dependencies = [
++ "base16ct",
++ "der",
++ "generic-array",
++ "pkcs8",
++ "subtle",
++ "zeroize",
++]
++
++[[package]]
++name = "semver"
++version = "1.0.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
++
++[[package]]
++name = "serde"
++version = "1.0.152"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.152"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.93"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
++dependencies = [
++ "indexmap",
++ "itoa",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "serde_qs"
++version = "0.8.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
++dependencies = [
++ "percent-encoding",
++ "serde",
++ "thiserror",
++]
++
++[[package]]
++name = "serde_urlencoded"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
++dependencies = [
++ "form_urlencoded",
++ "itoa",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "serde_with"
++version = "1.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
++dependencies = [
++ "serde",
++ "serde_with_macros",
++]
++
++[[package]]
++name = "serde_with_macros"
++version = "1.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
++dependencies = [
++ "darling",
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "sha2"
++version = "0.10.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
++dependencies = [
++ "cfg-if",
++ "cpufeatures",
++ "digest",
++]
++
++[[package]]
++name = "signature"
++version = "1.6.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
++dependencies = [
++ "digest",
++ "rand_core 0.6.4",
++]
++
++[[package]]
++name = "signature"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
++dependencies = [
++ "digest",
++ "rand_core 0.6.4",
++]
++
++[[package]]
++name = "slab"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "smallvec"
++version = "1.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
++
++[[package]]
++name = "socket2"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
++dependencies = [
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "spin"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
++
++[[package]]
++name = "spin"
++version = "0.9.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc"
++
++[[package]]
++name = "spki"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
++dependencies = [
++ "base64ct",
++ "der",
++]
++
++[[package]]
++name = "strsim"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
++
++[[package]]
++name = "subtle"
++version = "2.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
++
++[[package]]
++name = "syn"
++version = "1.0.109"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-ident",
++]
 +
 +[[package]]
-+name = "scoped-tls"
-+version = "1.0.0"
++name = "synstructure"
++version = "0.12.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
++checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "unicode-xid",
++]
 +
 +[[package]]
-+name = "scopeguard"
-+version = "1.1.0"
++name = "tempfile"
++version = "3.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
++checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
++dependencies = [
++ "cfg-if",
++ "fastrand",
++ "redox_syscall",
++ "rustix",
++ "windows-sys 0.42.0",
++]
 +
 +[[package]]
-+name = "sec1"
-+version = "0.3.0"
++name = "termcolor"
++version = "1.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
++checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
 +dependencies = [
-+ "base16ct",
-+ "der 0.6.0",
-+ "generic-array",
-+ "pkcs8 0.9.0",
-+ "serdect",
-+ "subtle",
-+ "zeroize",
++ "winapi-util",
 +]
 +
 +[[package]]
-+name = "semver"
-+version = "1.0.13"
++name = "testcontainers"
++version = "0.14.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
++checksum = "0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87"
++dependencies = [
++ "bollard-stubs",
++ "futures",
++ "hex",
++ "hmac",
++ "log",
++ "rand 0.8.5",
++ "serde",
++ "serde_json",
++ "sha2",
++]
 +
 +[[package]]
-+name = "serde"
-+version = "1.0.144"
++name = "thiserror"
++version = "1.0.38"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
++checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 +dependencies = [
-+ "serde_derive",
++ "thiserror-impl",
 +]
 +
 +[[package]]
-+name = "serde_derive"
-+version = "1.0.144"
++name = "thiserror-impl"
++version = "1.0.38"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
++checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 +dependencies = [
 + "proc-macro2",
 + "quote",
@@ -985,168 +2426,219 @@ index 0000000..3f52488
 +]
 +
 +[[package]]
-+name = "serde_json"
-+version = "1.0.85"
++name = "time"
++version = "0.1.45"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
++checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
 +dependencies = [
-+ "itoa",
-+ "ryu",
-+ "serde",
++ "libc",
++ "wasi 0.10.0+wasi-snapshot-preview1",
++ "winapi",
 +]
 +
 +[[package]]
-+name = "serdect"
-+version = "0.1.0"
++name = "time"
++version = "0.3.20"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "038fce1bf4d74b9b30ea7dcd59df75ba8ec669a5dcb3cc64fbfcef7334ced32c"
++checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
 +dependencies = [
-+ "base16ct",
++ "itoa",
++ "js-sys",
 + "serde",
++ "time-core",
++ "time-macros",
 +]
 +
 +[[package]]
-+name = "sha2"
-+version = "0.10.5"
++name = "time-core"
++version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5"
-+dependencies = [
-+ "cfg-if",
-+ "cpufeatures",
-+ "digest",
-+]
++checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
 +
 +[[package]]
-+name = "signature"
-+version = "1.6.0"
++name = "time-macros"
++version = "0.2.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f0ea32af43239f0d353a7dd75a22d94c329c8cdaafdcb4c1c1335aa10c298a4a"
++checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
 +dependencies = [
-+ "digest",
-+ "rand_core",
++ "time-core",
 +]
 +
 +[[package]]
-+name = "slab"
-+version = "0.4.7"
++name = "tinyvec"
++version = "1.6.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
 +dependencies = [
-+ "autocfg",
++ "tinyvec_macros",
 +]
 +
 +[[package]]
-+name = "smallvec"
-+version = "1.9.0"
++name = "tinyvec_macros"
++version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
++checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 +
 +[[package]]
-+name = "spin"
-+version = "0.5.2"
++name = "tokio"
++version = "1.25.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
++checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
++dependencies = [
++ "autocfg",
++ "bytes",
++ "libc",
++ "memchr",
++ "mio",
++ "num_cpus",
++ "pin-project-lite",
++ "socket2",
++ "tokio-macros",
++ "windows-sys 0.42.0",
++]
 +
 +[[package]]
-+name = "spki"
-+version = "0.5.4"
++name = "tokio-macros"
++version = "1.8.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
++checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 +dependencies = [
-+ "base64ct",
-+ "der 0.5.1",
++ "proc-macro2",
++ "quote",
++ "syn",
 +]
 +
 +[[package]]
-+name = "spki"
-+version = "0.6.0"
++name = "tokio-rustls"
++version = "0.23.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
++checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 +dependencies = [
-+ "base64ct",
-+ "der 0.6.0",
++ "rustls",
++ "tokio",
++ "webpki",
 +]
 +
 +[[package]]
-+name = "subtle"
-+version = "2.4.1"
++name = "tokio-util"
++version = "0.7.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
++checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
++dependencies = [
++ "bytes",
++ "futures-core",
++ "futures-sink",
++ "pin-project-lite",
++ "tokio",
++ "tracing",
++]
 +
 +[[package]]
-+name = "syn"
-+version = "1.0.99"
++name = "tonic-build"
++version = "0.8.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
++checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4"
 +dependencies = [
++ "prettyplease",
 + "proc-macro2",
++ "prost-build",
 + "quote",
-+ "unicode-ident",
++ "syn",
 +]
 +
 +[[package]]
-+name = "thiserror"
-+version = "1.0.34"
++name = "tower-service"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
++
++[[package]]
++name = "tracing"
++version = "0.1.37"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252"
++checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 +dependencies = [
-+ "thiserror-impl",
++ "cfg-if",
++ "pin-project-lite",
++ "tracing-core",
 +]
 +
 +[[package]]
-+name = "thiserror-impl"
-+version = "1.0.34"
++name = "tracing-core"
++version = "0.1.30"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487"
++checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
 +dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn",
++ "once_cell",
 +]
 +
 +[[package]]
-+name = "tinyvec"
-+version = "1.6.0"
++name = "treediff"
++version = "4.0.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
++checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303"
 +dependencies = [
-+ "tinyvec_macros",
++ "serde_json",
 +]
 +
 +[[package]]
-+name = "tinyvec_macros"
-+version = "0.1.0"
++name = "try-lock"
++version = "0.2.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
++checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 +
 +[[package]]
 +name = "typenum"
-+version = "1.15.0"
++version = "1.16.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
++checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 +
 +[[package]]
 +name = "unicode-bidi"
-+version = "0.3.8"
++version = "0.3.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
++checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
 +
 +[[package]]
 +name = "unicode-ident"
-+version = "1.0.3"
++version = "1.0.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
++checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 +
 +[[package]]
 +name = "unicode-normalization"
-+version = "0.1.21"
++version = "0.1.22"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 +dependencies = [
 + "tinyvec",
 +]
 +
 +[[package]]
++name = "unicode-width"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
++
++[[package]]
++name = "untrusted"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
++
++[[package]]
++name = "untrusted"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
++
++[[package]]
 +name = "url"
 +version = "2.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1160,20 +2652,54 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "uuid"
-+version = "1.1.2"
++version = "1.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
++checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
 +dependencies = [
-+ "getrandom",
++ "getrandom 0.2.8",
 +]
 +
 +[[package]]
++name = "vcpkg"
++version = "0.2.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
++
++[[package]]
 +name = "version_check"
 +version = "0.9.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 +
 +[[package]]
++name = "waker-fn"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
++
++[[package]]
++name = "want"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
++dependencies = [
++ "log",
++ "try-lock",
++]
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "wasi"
++version = "0.10.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
++
++[[package]]
 +name = "wasi"
 +version = "0.11.0+wasi-snapshot-preview1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1181,9 +2707,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "wasm-bindgen"
-+version = "0.2.82"
++version = "0.2.84"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
++checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
 +dependencies = [
 + "cfg-if",
 + "wasm-bindgen-macro",
@@ -1191,9 +2717,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "wasm-bindgen-backend"
-+version = "0.2.82"
++version = "0.2.84"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
++checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
 +dependencies = [
 + "bumpalo",
 + "log",
@@ -1206,9 +2732,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "wasm-bindgen-futures"
-+version = "0.4.32"
++version = "0.4.34"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad"
++checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
 +dependencies = [
 + "cfg-if",
 + "js-sys",
@@ -1218,9 +2744,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "wasm-bindgen-macro"
-+version = "0.2.82"
++version = "0.2.84"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
++checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
 +dependencies = [
 + "quote",
 + "wasm-bindgen-macro-support",
@@ -1228,9 +2754,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "wasm-bindgen-macro-support"
-+version = "0.2.82"
++version = "0.2.84"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
++checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
 +dependencies = [
 + "proc-macro2",
 + "quote",
@@ -1241,15 +2767,15 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "wasm-bindgen-shared"
-+version = "0.2.82"
++version = "0.2.84"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
++checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 +
 +[[package]]
 +name = "wasm-bindgen-test"
-+version = "0.3.32"
++version = "0.3.34"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "513df541345bb9fcc07417775f3d51bbb677daf307d8035c0afafd87dc2e6599"
++checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b"
 +dependencies = [
 + "console_error_panic_hook",
 + "js-sys",
@@ -1261,9 +2787,9 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "wasm-bindgen-test-macro"
-+version = "0.3.32"
++version = "0.3.34"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6150d36a03e90a3cf6c12650be10626a9902d70c5270fd47d7a47e5389a10d56"
++checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9"
 +dependencies = [
 + "proc-macro2",
 + "quote",
@@ -1271,15 +2797,36 @@ index 0000000..3f52488
 +
 +[[package]]
 +name = "web-sys"
-+version = "0.3.59"
++version = "0.3.61"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
++checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
 +dependencies = [
 + "js-sys",
 + "wasm-bindgen",
 +]
 +
 +[[package]]
++name = "webpki"
++version = "0.22.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
++dependencies = [
++ "ring 0.16.20",
++ "untrusted 0.7.1",
++]
++
++[[package]]
++name = "which"
++version = "4.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
++dependencies = [
++ "either",
++ "libc",
++ "once_cell",
++]
++
++[[package]]
 +name = "winapi"
 +version = "0.3.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1296,16 +2843,183 @@ index 0000000..3f52488
 +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 +
 +[[package]]
++name = "winapi-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
 +name = "winapi-x86_64-pc-windows-gnu"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 +
 +[[package]]
++name = "windows-sys"
++version = "0.42.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
++dependencies = [
++ "windows_aarch64_gnullvm",
++ "windows_aarch64_msvc",
++ "windows_i686_gnu",
++ "windows_i686_msvc",
++ "windows_x86_64_gnu",
++ "windows_x86_64_gnullvm",
++ "windows_x86_64_msvc",
++]
++
++[[package]]
++name = "windows-sys"
++version = "0.45.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
++dependencies = [
++ "windows-targets",
++]
++
++[[package]]
++name = "windows-targets"
++version = "0.42.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
++dependencies = [
++ "windows_aarch64_gnullvm",
++ "windows_aarch64_msvc",
++ "windows_i686_gnu",
++ "windows_i686_msvc",
++ "windows_x86_64_gnu",
++ "windows_x86_64_gnullvm",
++ "windows_x86_64_msvc",
++]
++
++[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.42.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
++
++[[package]]
++name = "windows_aarch64_msvc"
++version = "0.42.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
++
++[[package]]
++name = "windows_i686_gnu"
++version = "0.42.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
++
++[[package]]
++name = "windows_i686_msvc"
++version = "0.42.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
++
++[[package]]
++name = "windows_x86_64_gnu"
++version = "0.42.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
++
++[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.42.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
++
++[[package]]
++name = "windows_x86_64_msvc"
++version = "0.42.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
++
++[[package]]
++name = "winreg"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "wire-e2e-identity"
++version = "0.2.0"
++dependencies = [
++ "asserhttp",
++ "base64 0.21.0",
++ "derive_more",
++ "hex",
++ "hyper",
++ "itertools",
++ "jwt-simple",
++ "rand 0.8.5",
++ "reqwest",
++ "rusty-acme",
++ "rusty-jwt-tools",
++ "serde",
++ "serde_json",
++ "testcontainers",
++ "thiserror",
++ "tokio",
++ "url",
++ "uuid",
++ "wasm-bindgen-test",
++ "x509-parser",
++]
++
++[[package]]
++name = "x509-parser"
++version = "0.14.0"
++source = "git+https://github.com/wireapp/x509-parser?tag=v1.0.2-pre.core-crypto-0.6.0#4fbc4c795fc84537ba24eb91e563c9e80d3bd5d4"
++dependencies = [
++ "asn1-rs",
++ "base64 0.21.0",
++ "chrono",
++ "data-encoding",
++ "der-parser",
++ "lazy_static",
++ "nom",
++ "oid-registry",
++ "ring 0.17.0-not-released-yet",
++ "rusticata-macros",
++ "thiserror",
++]
++
++[[package]]
++name = "yasna"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4"
++dependencies = [
++ "time 0.3.20",
++]
++
++[[package]]
 +name = "zeroize"
 +version = "1.5.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
--- 
++dependencies = [
++ "zeroize_derive",
++]
++
++[[package]]
++name = "zeroize_derive"
++version = "1.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "synstructure",
++]
+--
 2.34.1
 
diff --git a/nix/pkgs/rusty_jwt_tools_ffi/default.nix b/nix/pkgs/rusty_jwt_tools_ffi/default.nix
index f59bcd9bcd..04cd3597c7 100644
--- a/nix/pkgs/rusty_jwt_tools_ffi/default.nix
+++ b/nix/pkgs/rusty_jwt_tools_ffi/default.nix
@@ -1,20 +1,27 @@
 { fetchFromGitHub
 , lib
 , rustPlatform
+, pkg-config
+, perl
+, gitMinimal
 }:
 
 rustPlatform.buildRustPackage rec {
   name = "rusty_jwt-tools_ffi-${version}";
-  version = "0.1.0";
+  version = "0.2.0";
+  nativeBuildInputs = [ pkg-config perl gitMinimal ];
   src = fetchFromGitHub {
     owner = "wireapp";
     repo = "rusty-jwt-tools";
     # if you update this, please generate a new Cargo.lock file es described below at `cargoPatches`
-    rev = "6370cd556f03f6834d0b8043615ffaf0044ef1fa";
-    sha256 = "sha256-vnTvKITie4pu+ISIl/RdYPfb/yWCdCI9eHl1KcZb050=";
+    rev = "a68ed483f7e98613c0d5c3608c684f25225a58d3";
+    sha256 = "sha256-+2fjwtG80l8Vt48QWKm4wevY7MQRAwuo4YFbjB+6w9I=";
   };
-  cargoBuildFeatures = "haskell";
-  cargoSha256 = "sha256-9etHOl3B/ybKdKMRUDb/VPxg4ghlIe75smWuupLORU8=";
+  doCheck = false;
+  cargoSha256 = "sha256-BHq28U3OzYCPNmfnxlmXsz9XYEy1kRiNrFM9OTnAkk0=";
+  cargoDepsHook = ''
+    mkdir -p rusty_jwt-tools_ffi-${version}-vendor.tar.gz/ring/.git
+  '';
   cargoPatches = [
     # a patch file to add/update Cargo.lock in the source code
     # it's good practice not to add Cargo.lock to the source code for libraries
@@ -23,7 +30,7 @@ rustPlatform.buildRustPackage rec {
     # - `git clone git@github.com:wireapp/rusty-jwt-tools.git`
     # - checkout the commit specified in `rev`
     # - create a new branch: `git checkout -b patch-cargo-lock-<rev>` (replace `<rev>` with the commit hash)
-    # - `cargo build --release --features haskell`
+    # - `cargo clean && cargo build --release`
     # - `git add -f Cargo.lock`
     # - `git commit -am "generate new cargo.lock"`
     # - `git format-patch main`

From e5e2662fee1d544f34a7aef3f0962ca946edfdf8 Mon Sep 17 00:00:00 2001
From: Leif Battermann <leif.battermann@wire.com>
Date: Wed, 1 Mar 2023 14:36:14 +0000
Subject: [PATCH 2/4] fix rust ffi + additional happy day test

---
 libs/jwt-tools/src/Data/Jwt/Tools.hs | 38 +++++++------
 libs/jwt-tools/test/Spec.hs          | 81 ++++++++++++++++++----------
 2 files changed, 75 insertions(+), 44 deletions(-)

diff --git a/libs/jwt-tools/src/Data/Jwt/Tools.hs b/libs/jwt-tools/src/Data/Jwt/Tools.hs
index 11edd177bf..03bf90e501 100644
--- a/libs/jwt-tools/src/Data/Jwt/Tools.hs
+++ b/libs/jwt-tools/src/Data/Jwt/Tools.hs
@@ -47,13 +47,13 @@ import Foreign.Storable (peek)
 import Imports
 import Network.HTTP.Types (StdMethod (..))
 
-data JwtResponse
+data HsResult
 
 type ProofCStr = CString
 
 type UserIdCStr = CString
 
-type ClientIdWord16 = Word16
+type ClientIdWord64 = Word64
 
 type DomainCStr = CString
 
@@ -75,7 +75,7 @@ foreign import ccall unsafe "generate_dpop_access_token"
   generate_dpop_access_token ::
     ProofCStr ->
     UserIdCStr ->
-    ClientIdWord16 ->
+    ClientIdWord64 ->
     DomainCStr ->
     NonceCStr ->
     UrlCStr ->
@@ -84,18 +84,18 @@ foreign import ccall unsafe "generate_dpop_access_token"
     ExpiryEpochWord64 ->
     EpochWord64 ->
     BackendBundleCStr ->
-    IO (Ptr JwtResponse)
+    IO (Ptr HsResult)
 
-foreign import ccall unsafe "free_dpop_access_token" free_dpop_access_token :: Ptr JwtResponse -> IO ()
+foreign import ccall unsafe "free_dpop_access_token" free_dpop_access_token :: Ptr HsResult -> IO ()
 
-foreign import ccall unsafe "get_error" get_error :: Ptr JwtResponse -> Ptr CUChar
+foreign import ccall unsafe "get_error" get_error :: Ptr HsResult -> Ptr CUChar
 
-foreign import ccall unsafe "get_token" get_token :: Ptr JwtResponse -> CString
+foreign import ccall unsafe "get_token" get_token :: Ptr HsResult -> CString
 
 generateDpopAccessTokenFfi ::
   ProofCStr ->
   UserIdCStr ->
-  ClientIdWord16 ->
+  ClientIdWord64 ->
   DomainCStr ->
   NonceCStr ->
   UrlCStr ->
@@ -104,26 +104,26 @@ generateDpopAccessTokenFfi ::
   ExpiryEpochWord64 ->
   EpochWord64 ->
   BackendBundleCStr ->
-  IO (Maybe (Ptr JwtResponse))
+  IO (Maybe (Ptr HsResult))
 generateDpopAccessTokenFfi dpopProof user client domain nonce uri method maxSkewSecs expiration now backendKeys = do
   ptr <- generate_dpop_access_token dpopProof user client domain nonce uri method maxSkewSecs expiration now backendKeys
   if ptr /= nullPtr
     then pure $ Just ptr
     else pure Nothing
 
-getErrorFfi :: Ptr JwtResponse -> IO (Maybe Word8)
+getErrorFfi :: Ptr HsResult -> IO (Maybe Word8)
 getErrorFfi ptr = do
   let errorPtr = get_error ptr
   if errorPtr /= nullPtr
-    then Just . fromIntegral <$> peek errorPtr
-    else pure Nothing
+    then putStrLn "error ptr is not null" *> (Just . fromIntegral <$> peek errorPtr)
+    else putStrLn "error ptr is null" *> (pure Nothing)
 
-getTokenFfi :: Ptr JwtResponse -> IO (Maybe String)
+getTokenFfi :: Ptr HsResult -> IO (Maybe String)
 getTokenFfi ptr = do
   let tokenPtr = get_token ptr
   if tokenPtr /= nullPtr
-    then Just <$> peekCString tokenPtr
-    else pure Nothing
+    then putStrLn "token ptr is not null" *> (Just <$> peekCString tokenPtr)
+    else putStrLn "token ptr is null" *> (pure Nothing)
 
 generateDpopToken ::
   (MonadIO m) =>
@@ -162,10 +162,14 @@ generateDpopToken dpopProof uid cid domain nonce uri method maxSkewSecs maxExpir
           (_unNowEpoch now)
           backendPubkeyBundleCStr
 
+  let printErr w8 = do
+        putStrLn $ "error code: " <> show w8
+        pure w8
+
   let mkAccessToken response = do
         case response of
           Nothing -> pure $ Left FfiError
-          Just r -> toResult <$> getErrorFfi r <*> getTokenFfi r
+          Just r -> toResult <$> (getErrorFfi r >>= printErr) <*> getTokenFfi r
 
   let free = maybe (pure ()) free_dpop_access_token
 
@@ -212,7 +216,7 @@ newtype UserId = UserId {_unUserId :: ByteString}
   deriving (Eq, Show)
   deriving newtype (ToByteString)
 
-newtype ClientId = ClientId {_unClientId :: Word16}
+newtype ClientId = ClientId {_unClientId :: Word64}
   deriving (Eq, Show)
   deriving newtype (ToByteString)
 
diff --git a/libs/jwt-tools/test/Spec.hs b/libs/jwt-tools/test/Spec.hs
index 77b702f649..0c54be31ca 100644
--- a/libs/jwt-tools/test/Spec.hs
+++ b/libs/jwt-tools/test/Spec.hs
@@ -23,11 +23,14 @@ import Test.Hspec
 
 main :: IO ()
 main = hspec $ do
-  describe "generateDpopToken FFI" $ do
-    it "should return a value" $ do
-      actual <- callFFIWithConstValues
-      let expected = Right $ cs token
-      actual `shouldBe` expected
+  describe "generateDpopToken FFI when passing valid inputs" $ do
+    it "should return an access token" $ do
+      actual <- callFFIWithValidValues
+      isRight actual `shouldBe` True
+  describe "generateDpopToken FFI when passing nonsense values" $ do
+    it "should return an error" $ do
+      actual <- callFFIWithNonsenseValues
+      isRight actual `shouldBe` False
   describe "toResult" $ do
     it "should convert to correct error" $ do
       toResult Nothing (Just token) `shouldBe` Right (cs token)
@@ -68,28 +71,52 @@ main = hspec $ do
       toResult (Just 18) Nothing `shouldBe` Left ExpError
       toResult (Just 18) (Just token) `shouldBe` Left ExpError
       toResult Nothing Nothing `shouldBe` Left UnknownError
+  where
+    token :: String
+    token = "eyJ0eXAiOiJKV1QiLA0KICJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJqb2UiLA0KICJleiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ.dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"
 
-token :: String
-token = "eyJ0eXAiOiJKV1QiLA0KICJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJqb2UiLA0KICJleiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ.dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"
+callFFIWithNonsenseValues :: IO (Either DPoPTokenGenerationError ByteString)
+callFFIWithNonsenseValues =
+  runExceptT $ generateDpopToken proof uid cid domain nonce uri method maxSkewSecs expires now pem
+  where
+    proof = Proof "xxxx.yyyy.zzzz"
+    uid = UserId "8a6e8a6e-8a6e-8a6e-8a6e-8a6e8a6e8a6e"
+    cid = ClientId 8899
+    domain = Domain "example.com"
+    nonce = Nonce "123"
+    uri = Uri "/foo"
+    method = POST
+    maxSkewSecs = MaxSkewSecs 1
+    now = NowEpoch 5435234232
+    expires = ExpiryEpoch $ 5435234232 + 360
+    pem =
+      PemBundle $
+        "-----BEGIN PRIVATE KEY-----\n\
+        \MC4CAQAwBQYDK2VwBCIEIFANnxZLNE4p+GDzWzR3wm/v8x/0bxZYkCyke1aTRucX\n\
+        \-----END PRIVATE KEY-----\n\
+        \-----BEGIN PUBLIC KEY-----\n\
+        \MCowBQYDK2VwAyEACPvhIdimF20tOPjbb+fXJrwS2RKDp7686T90AZ0+Th8=\n\
+        \-----END PUBLIC KEY-----\n"
 
-callFFIWithConstValues :: IO (Either DPoPTokenGenerationError ByteString)
-callFFIWithConstValues = do
-  let proof = Proof "xxxx.yyyy.zzzz"
-  let uid = UserId "8a6e8a6e-8a6e-8a6e-8a6e-8a6e8a6e8a6e"
-  let cid = ClientId 8899
-  let domain = Domain "example.com"
-  let nonce = Nonce "123"
-  let uri = Uri "/foo"
-  let method = POST
-  let maxSkewSecs = MaxSkewSecs 1
-  let now = NowEpoch 5435234232
-  let expires = ExpiryEpoch $ 5435234232 + 360
-  let pem =
-        PemBundle $
-          "-----BEGIN PRIVATE KEY-----\n\
-          \MC4CAQAwBQYDK2VwBCIEIFANnxZLNE4p+GDzWzR3wm/v8x/0bxZYkCyke1aTRucX\n\
-          \-----END PRIVATE KEY-----\n\
-          \-----BEGIN PUBLIC KEY-----\n\
-          \MCowBQYDK2VwAyEACPvhIdimF20tOPjbb+fXJrwS2RKDp7686T90AZ0+Th8=\n\
-          \-----END PUBLIC KEY-----\n"
+callFFIWithValidValues :: IO (Either DPoPTokenGenerationError ByteString)
+callFFIWithValidValues =
   runExceptT $ generateDpopToken proof uid cid domain nonce uri method maxSkewSecs expires now pem
+  where
+    proof = Proof "eyJhbGciOiJFZERTQSIsInR5cCI6ImRwb3Arand0IiwiandrIjp7Imt0eSI6Ik9LUCIsImNydiI6IkVkMjU1MTkiLCJ4IjoiZzQwakI3V3pmb2ZCdkxCNVlybmlZM2ZPZU1WVGtfNlpfVnNZM0tBbnpOUSJ9fQ.eyJpYXQiOjE2Nzc2NzAwODEsImV4cCI6MTY3Nzc1NjQ4MSwibmJmIjoxNjc3NjcwMDgxLCJzdWIiOiJpbXBwOndpcmVhcHA9WldKa01qY3labUk0TW1aa05ETXlZamczTm1NM1lXSmtZVFUwWkdSaU56VS8xODllNDhjNmNhODZiNWQ0QGV4YW1wbGUub3JnIiwianRpIjoiZDE5ZWExYmItNWI0Ny00ZGJiLWE1MTktNjU0ZWRmMjU0MTQ0Iiwibm9uY2UiOiJZMkZVTjJaTlExUnZSV0l6Ympsa2RGRjFjWGhHZDJKbWFXUlRiamhXZVdRIiwiaHRtIjoiUE9TVCIsImh0dSI6Imh0dHA6Ly9sb2NhbGhvc3Q6NjQwNTQvIiwiY2hhbCI6IkJpMkpkUGk1eWVTTVdhZjA5TnJEZTVUQXFjZ0FnQmE3In0._PrwHUTS7EoAflXyNDlPNqGMbjKu-JuSXwkNPyryBQdg2gDIb20amsH05Ocih78Josz9h7lAB6FvAWsXKQB1Dw"
+    uid = UserId "ebd272fb-82fd-432b-876c-7abda54ddb75"
+    cid = ClientId 1773935321869104596
+    domain = Domain "example.org"
+    nonce = Nonce "Y2FUN2ZNQ1RvRWIzbjlkdFF1cXhGd2JmaWRTbjhWeWQ"
+    uri = Uri "http://localhost:64054/"
+    method = POST
+    maxSkewSecs = MaxSkewSecs 2
+    now = NowEpoch 5435234232
+    expires = ExpiryEpoch $ 2082008461
+    pem =
+      PemBundle $
+        "-----BEGIN PRIVATE KEY-----\n\
+        \MC4CAQAwBQYDK2VwBCIEIKW3jzXCsRVgnclmiTu53Pu1/r6AUmnKDoghOOVMjozQ\n\
+        \-----END PRIVATE KEY-----\n\
+        \-----BEGIN PUBLIC KEY-----\n\
+        \MCowBQYDK2VwAyEA7t9veqi02mPhllm44JXWga8m/l4JxUeQm3qPyMlerxY=\n\
+        \-----END PUBLIC KEY-----\n"

From 7be5b5faced1c34c1cac0776e6c2a389fd61e377 Mon Sep 17 00:00:00 2001
From: Leif Battermann <leif.battermann@wire.com>
Date: Wed, 1 Mar 2023 14:44:26 +0000
Subject: [PATCH 3/4] changelog

---
 changelog.d/5-internal/pr-3112 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5-internal/pr-3112

diff --git a/changelog.d/5-internal/pr-3112 b/changelog.d/5-internal/pr-3112
new file mode 100644
index 0000000000..3b095c6ccf
--- /dev/null
+++ b/changelog.d/5-internal/pr-3112
@@ -0,0 +1 @@
+Rust library `rusty-jwt-tools` upgraded to latest version

From 61345884cd40225a35e3d74f93da7295819ce7f4 Mon Sep 17 00:00:00 2001
From: Leif Battermann <leif.battermann@wire.com>
Date: Wed, 1 Mar 2023 15:37:20 +0000
Subject: [PATCH 4/4] fix integration tests

---
 libs/jwt-tools/src/Data/Jwt/Tools.hs          | 16 +++++--------
 services/brig/src/Brig/API/Error.hs           | 11 +++++----
 services/brig/src/Brig/Effects/JwtTools.hs    |  2 +-
 .../brig/test/integration/API/User/Client.hs  | 24 +++++++++----------
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/libs/jwt-tools/src/Data/Jwt/Tools.hs b/libs/jwt-tools/src/Data/Jwt/Tools.hs
index 03bf90e501..23360373fc 100644
--- a/libs/jwt-tools/src/Data/Jwt/Tools.hs
+++ b/libs/jwt-tools/src/Data/Jwt/Tools.hs
@@ -115,15 +115,15 @@ getErrorFfi :: Ptr HsResult -> IO (Maybe Word8)
 getErrorFfi ptr = do
   let errorPtr = get_error ptr
   if errorPtr /= nullPtr
-    then putStrLn "error ptr is not null" *> (Just . fromIntegral <$> peek errorPtr)
-    else putStrLn "error ptr is null" *> (pure Nothing)
+    then Just . fromIntegral <$> peek errorPtr
+    else pure Nothing
 
 getTokenFfi :: Ptr HsResult -> IO (Maybe String)
 getTokenFfi ptr = do
   let tokenPtr = get_token ptr
   if tokenPtr /= nullPtr
-    then putStrLn "token ptr is not null" *> (Just <$> peekCString tokenPtr)
-    else putStrLn "token ptr is null" *> (pure Nothing)
+    then Just <$> peekCString tokenPtr
+    else pure Nothing
 
 generateDpopToken ::
   (MonadIO m) =>
@@ -162,14 +162,10 @@ generateDpopToken dpopProof uid cid domain nonce uri method maxSkewSecs maxExpir
           (_unNowEpoch now)
           backendPubkeyBundleCStr
 
-  let printErr w8 = do
-        putStrLn $ "error code: " <> show w8
-        pure w8
-
   let mkAccessToken response = do
         case response of
           Nothing -> pure $ Left FfiError
-          Just r -> toResult <$> (getErrorFfi r >>= printErr) <*> getTokenFfi r
+          Just r -> toResult <$> getErrorFfi r <*> getTokenFfi r
 
   let free = maybe (pure ()) free_dpop_access_token
 
@@ -194,7 +190,7 @@ generateDpopToken dpopProof uid cid domain nonce uri method maxSkewSecs maxExpir
       PATCH -> "PATCH"
 
 toResult :: Maybe Word8 -> Maybe String -> Either DPoPTokenGenerationError ByteString
--- the only valid case is when the error=0 (meaning no error) and the token is not null
+-- the only valid cases are when the error=0 (meaning no error) or nothing and the token is not null
 toResult (Just 0) (Just token) = Right $ cs token
 toResult Nothing (Just token) = Right $ cs token
 -- errors
diff --git a/services/brig/src/Brig/API/Error.hs b/services/brig/src/Brig/API/Error.hs
index 22290a120d..7cd9ceb025 100644
--- a/services/brig/src/Brig/API/Error.hs
+++ b/services/brig/src/Brig/API/Error.hs
@@ -171,11 +171,14 @@ clientError ClientMissingLegalholdConsent = StdError (errorToWai @'E.MissingLega
 clientError ClientCodeAuthenticationFailed = StdError verificationCodeAuthFailed
 clientError ClientCodeAuthenticationRequired = StdError verificationCodeRequired
 
+-- Note that UnknownError, FfiError, and ImplementationError semantically should rather be 500s than 400s.
+-- However, the errors returned from the FFI are not always correct,
+-- and we don't want to bombard our environments with 500 log messages, so we treat them as 400s, for now.
 certEnrollmentError :: CertEnrollmentError -> Error
-certEnrollmentError (RustError NoError) = StdError $ Wai.mkError status500 "internal-error" "The server experienced an internal error during DPoP token generation. Unexpected NoError."
-certEnrollmentError (RustError UnknownError) = StdError $ Wai.mkError status500 "internal-error" "The server experienced an internal error during DPoP token generation. Unknown error."
-certEnrollmentError (RustError FfiError) = StdError $ Wai.mkError status500 "internal-error" "The server experienced an internal error during DPoP token generation"
-certEnrollmentError (RustError ImplementationError) = StdError $ Wai.mkError status500 "internal-error" "The server experienced an internal error during DPoP token generation. Unexpected ImplementationError."
+certEnrollmentError (RustError NoError) = StdError $ Wai.mkError status400 "internal-error" "The server experienced an internal error during DPoP token generation. Unexpected NoError."
+certEnrollmentError (RustError UnknownError) = StdError $ Wai.mkError status400 "internal-error" "The server experienced an internal error during DPoP token generation. Unknown error."
+certEnrollmentError (RustError FfiError) = StdError $ Wai.mkError status400 "internal-error" "The server experienced an internal error during DPoP token generation"
+certEnrollmentError (RustError ImplementationError) = StdError $ Wai.mkError status400 "internal-error" "The server experienced an internal error during DPoP token generation. Unexpected ImplementationError."
 certEnrollmentError (RustError DpopSyntaxError) = StdError $ Wai.mkError status400 "client-token-parse-error" "The client JWT DPoP could not be parsed"
 certEnrollmentError (RustError DpopTypError) = StdError $ Wai.mkError status400 "client-token-type-error" "The client JWT DPoP 'typ' must be 'dpop+jwt'"
 certEnrollmentError (RustError DpopUnsupportedAlgorithmError) = StdError $ Wai.mkError status400 "client-token-unsupported-alg" "DPoP signature algorithm (alg) in JWT header is not a supported algorithm (ES256, ES384, Ed25519)"
diff --git a/services/brig/src/Brig/Effects/JwtTools.hs b/services/brig/src/Brig/Effects/JwtTools.hs
index 8d2692d9ec..3901602fac 100644
--- a/services/brig/src/Brig/Effects/JwtTools.hs
+++ b/services/brig/src/Brig/Effects/JwtTools.hs
@@ -48,7 +48,7 @@ makeSem ''JwtTools
 
 interpretJwtTools :: Member (Embed IO) r => Sem (JwtTools ': r) a -> Sem r a
 interpretJwtTools = interpret $ \(GenerateDPoPAccessToken pr ci n uri method skew ex now pem) -> do
-  case readHex @Word16 (cs $ client $ ciClient ci) of
+  case readHex @Word64 (cs $ client $ ciClient ci) of
     [(parsedClientId, "")] ->
       mapLeft RustError
         <$> runExceptT
diff --git a/services/brig/test/integration/API/User/Client.hs b/services/brig/test/integration/API/User/Client.hs
index ea9b6b6e27..87297e6bd8 100644
--- a/services/brig/test/integration/API/User/Client.hs
+++ b/services/brig/test/integration/API/User/Client.hs
@@ -121,7 +121,7 @@ tests _cl _at opts p db b c g =
       test p "get/head nonce/clients" $ testNewNonce b,
       testGroup
         "post /clients/:cid/access-token"
-        [ test p "success" $ testCreateAccessToken b,
+        [ test p "invalid values" $ testCreateAccessTokenInvalidValues b,
           test p "proof missing" $ testCreateAccessTokenMissingProof b,
           test p "no nonce" $ testCreateAccessTokenNoNonce b
         ]
@@ -1155,18 +1155,16 @@ testNewNonce brig = do
         Just "no-store" @=? getHeader "Cache-Control" response
       pure nonceBs
 
-testCreateAccessToken :: Brig -> Http ()
-testCreateAccessToken brig = do
-  uid <- userId <$> randomUser brig
-  cid <- createClientForUser brig uid
-  n <- Util.headNonce brig uid cid <!! const 200 === statusCode
-  let proof _nonce = Just $ Proof "xxxx.yyyy.zzzz"
-  response <- responseJsonError =<< Util.createAccessToken brig uid cid (proof n) <!! const 200 === statusCode
-  let expectedToken = DPoPAccessToken "eyJ0eXAiOiJKV1QiLA0KICJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJqb2UiLA0KICJleiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ.dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"
-  liftIO $ do
-    expectedToken @=? datrToken response
-    DPoP @=? datrType response
-    300 @=? datrExpiresIn response
+testCreateAccessTokenInvalidValues :: Brig -> Http ()
+testCreateAccessTokenInvalidValues brig =
+  do
+    uid <- userId <$> randomUser brig
+    cid <- createClientForUser brig uid
+    n <- Util.headNonce brig uid cid <!! const 200 === statusCode
+    let proof _nonce = Just $ Proof "xxxx.yyyy.zzzz"
+    Util.createAccessToken brig uid cid (proof n)
+      !!! do
+        const 400 === statusCode
 
 testCreateAccessTokenMissingProof :: Brig -> Http ()
 testCreateAccessTokenMissingProof brig = do