diff --git a/_servicedata b/_servicedata
index 84a35c0..0139455 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/keylime/rust-keylime.git</param>
-              <param name="changesrevision">01860934f7308bc5ea1e68c8d858aea056620ce8</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">63182344ab8efa90896eb0765c3ad9ecad11362e</param></service></servicedata>
\ No newline at end of file
diff --git a/bindgen.patch b/bindgen.patch
index 0faff81..0539881 100644
--- a/bindgen.patch
+++ b/bindgen.patch
@@ -1,16 +1,30 @@
-Index: rk/Cargo.lock
-===================================================================
---- rk.orig/Cargo.lock
-+++ rk/Cargo.lock
+From de5ed5feb1cf4f2b0dcf66c1b2177827040215b8 Mon Sep 17 00:00:00 2001
+From: Alberto Planas <aplanas@suse.com>
+Date: Mon, 26 Sep 2022 16:25:42 +0200
+Subject: [PATCH] Cargo.toml: tss-esapi bindings
+
+Generate the tss-esapi bindings during compilation time.  This will
+extend the ammount of supported architectures.
+
+Signed-off-by: Alberto Planas <aplanas@suse.com>
+---
+ Cargo.lock | 635 ++++++++++++++++++++++++++++++++---------------------
+ Cargo.toml |   2 +-
+ 2 files changed, 385 insertions(+), 252 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 96ff5e38..21b8c941 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
 @@ -21,9 +21,9 @@ dependencies = [
  
  [[package]]
  name = "actix-http"
 -version = "3.0.4"
-+version = "3.2.1"
++version = "3.2.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "a5885cb81a0d4d0d322864bea1bb6c2a8144626b4fdc625d4c51eba197e7797a"
-+checksum = "6f9ffb6db08c1c3a1f4aef540f1a63193adc73c4fbd40b75a95fc8c5258f6e51"
++checksum = "0c83abf9903e1f0ad9973cc4f7b9767fd5a03a583f51a5b7a339e07987cd2724"
  dependencies = [
   "actix-codec",
   "actix-rt",
@@ -30,31 +44,59 @@ Index: rk/Cargo.lock
   "zstd",
  ]
  
-@@ -151,9 +151,9 @@ dependencies = [
+@@ -69,16 +69,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "actix-router"
+-version = "0.5.0"
++version = "0.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "eb60846b52c118f2f04a56cc90880a274271c489b2498623d58176f8ca21fa80"
++checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799"
+ dependencies = [
+  "bytestring",
+- "firestorm",
+  "http",
+- "log",
+  "regex",
+  "serde",
++ "tracing",
+ ]
+ 
+ [[package]]
+@@ -151,9 +150,9 @@ dependencies = [
  
  [[package]]
  name = "actix-web"
 -version = "4.0.1"
-+version = "4.1.0"
++version = "4.2.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "f4e5ebffd51d50df56a3ae0de0e59487340ca456f05dd0b90c0a7a6dd6a74d31"
-+checksum = "a27e8fe9ba4ae613c21f677c2cfaf0696c3744030c6f485b34634e502d6bb379"
++checksum = "d48f7b6534e06c7bfc72ee91db7917d4af6afe23e7d223b51e68fffbb21e96b9"
  dependencies = [
   "actix-codec",
   "actix-http",
+@@ -174,6 +173,7 @@ dependencies = [
+  "encoding_rs",
+  "futures-core",
+  "futures-util",
++ "http",
+  "itoa",
+  "language-tags",
+  "log",
 @@ -192,9 +192,9 @@ dependencies = [
  
  [[package]]
  name = "actix-web-codegen"
 -version = "4.0.0"
-+version = "4.0.1"
++version = "4.1.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "7525bedf54704abb1d469e88d7e7e9226df73778798a69cea5022d53b2ae91bc"
-+checksum = "5f270541caec49c15673b0af0e9a00143421ad4f118d2df7edcb68b627632f56"
++checksum = "1fa9362663c8643d67b2d5eafba49e4cb2c8a053a29ed00a0bea121f17c76b13"
  dependencies = [
   "actix-router",
   "proc-macro2",
-@@ -220,7 +220,7 @@ version = "0.7.6"
+@@ -220,46 +220,55 @@ version = "0.7.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
  dependencies = [
@@ -63,10 +105,38 @@ Index: rk/Cargo.lock
   "once_cell",
   "version_check",
  ]
-@@ -250,16 +250,25 @@ dependencies = [
+ 
+ [[package]]
+ name = "aho-corasick"
+-version = "0.7.18"
++version = "0.7.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+ dependencies = [
+  "memchr",
  ]
  
  [[package]]
+ name = "alloc-no-stdlib"
+-version = "2.0.3"
++version = "2.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3"
++checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+ 
+ [[package]]
+ name = "alloc-stdlib"
+-version = "0.2.1"
++version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2"
++checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+ dependencies = [
+  "alloc-no-stdlib",
+ ]
+ 
++[[package]]
 +name = "ansi_term"
 +version = "0.12.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -75,13 +145,13 @@ Index: rk/Cargo.lock
 + "winapi",
 +]
 +
-+[[package]]
+ [[package]]
  name = "anyhow"
 -version = "1.0.57"
-+version = "1.0.60"
++version = "1.0.65"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
-+checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142"
++checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
  
  [[package]]
  name = "assert-json-diff"
@@ -98,10 +168,10 @@ Index: rk/Cargo.lock
  [[package]]
  name = "async-channel"
 -version = "1.6.1"
-+version = "1.7.0"
++version = "1.7.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
-+checksum = "4b31b87a3367ed04dbcbc252bce3f2a8172fef861d47177524c503c908dff2c6"
++checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
  dependencies = [
   "concurrent-queue",
   "event-listener",
@@ -117,10 +187,11 @@ Index: rk/Cargo.lock
  dependencies = [
   "proc-macro2",
   "quote",
-@@ -311,6 +320,29 @@ source = "registry+https://github.com/ru
+@@ -310,6 +319,29 @@ version = "0.13.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
  
- [[package]]
++[[package]]
 +name = "bindgen"
 +version = "0.59.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -130,7 +201,7 @@ Index: rk/Cargo.lock
 + "cexpr",
 + "clang-sys",
 + "clap 2.34.0",
-+ "env_logger 0.9.0",
++ "env_logger 0.9.1",
 + "lazy_static",
 + "lazycell",
 + "log",
@@ -143,11 +214,30 @@ Index: rk/Cargo.lock
 + "which",
 +]
 +
-+[[package]]
+ [[package]]
  name = "bitfield"
  version = "0.13.2"
+@@ -324,9 +356,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+ 
+ [[package]]
+ name = "block-buffer"
+-version = "0.10.2"
++version = "0.10.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -360,15 +392,15 @@ checksum = "37ccbd214614c6783386c1af30ca
+-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
++checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+ dependencies = [
+  "generic-array",
+ ]
+@@ -354,21 +386,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "bumpalo"
+-version = "3.10.0"
++version = "3.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
++checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
  
  [[package]]
  name = "bytes"
@@ -167,10 +257,11 @@ Index: rk/Cargo.lock
  dependencies = [
   "bytes",
  ]
-@@ -389,12 +421,47 @@ dependencies = [
+@@ -388,12 +420,47 @@ dependencies = [
+  "jobserver",
  ]
  
- [[package]]
++[[package]]
 +name = "cexpr"
 +version = "0.6.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -179,17 +270,17 @@ Index: rk/Cargo.lock
 + "nom",
 +]
 +
-+[[package]]
+ [[package]]
  name = "cfg-if"
  version = "1.0.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
  
- [[package]]
++[[package]]
 +name = "clang-sys"
-+version = "1.3.3"
++version = "1.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b"
++checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
 +dependencies = [
 + "glob",
 + "libc",
@@ -211,10 +302,9 @@ Index: rk/Cargo.lock
 + "vec_map",
 +]
 +
-+[[package]]
+ [[package]]
  name = "clap"
  version = "3.1.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
 @@ -406,9 +473,9 @@ dependencies = [
   "clap_lex",
   "indexmap",
@@ -223,7 +313,7 @@ Index: rk/Cargo.lock
 + "strsim 0.10.0",
   "termcolor",
 - "textwrap",
-+ "textwrap 0.15.0",
++ "textwrap 0.15.1",
  ]
  
  [[package]]
@@ -262,7 +352,31 @@ Index: rk/Cargo.lock
  dependencies = [
   "cache-padded",
  ]
-@@ -507,9 +574,9 @@ dependencies = [
+@@ -481,9 +548,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+ 
+ [[package]]
+ name = "cookie"
+-version = "0.16.0"
++version = "0.16.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05"
++checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917"
+ dependencies = [
+  "percent-encoding",
+  "time",
+@@ -508,9 +575,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+ 
+ [[package]]
+ name = "cpufeatures"
+-version = "0.2.2"
++version = "0.2.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
++checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+ dependencies = [
+  "libc",
+ ]
+@@ -526,9 +593,9 @@ dependencies = [
  
  [[package]]
  name = "crypto-common"
@@ -274,20 +388,20 @@ Index: rk/Cargo.lock
  dependencies = [
   "generic-array",
   "typenum",
-@@ -567,6 +634,12 @@ dependencies = [
- ]
+@@ -591,6 +658,12 @@ version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
  
- [[package]]
-+name = "either"
-+version = "1.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
-+
 +[[package]]
++name = "either"
++version = "1.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
++
+ [[package]]
  name = "encoding_rs"
  version = "0.8.31"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -602,7 +675,20 @@ source = "registry+https://github.com/ru
+@@ -627,7 +700,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
  dependencies = [
   "atty",
@@ -300,16 +414,16 @@ Index: rk/Cargo.lock
 +
 +[[package]]
 +name = "env_logger"
-+version = "0.9.0"
++version = "0.9.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
++checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
 +dependencies = [
 + "atty",
 + "humantime 2.1.0",
   "log",
   "regex",
   "termcolor",
-@@ -616,15 +702,15 @@ checksum = "d9435d864e017c3c6afeac165418
+@@ -641,25 +727,19 @@ checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
  
  [[package]]
  name = "event-listener"
@@ -329,7 +443,129 @@ Index: rk/Cargo.lock
  dependencies = [
   "instant",
  ]
-@@ -788,9 +874,9 @@ dependencies = [
+ 
+-[[package]]
+-name = "firestorm"
+-version = "0.5.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2c5f6c2c942da57e2aaaa84b8a521489486f14e75e7fa91dab70aba913975f98"
+-
+ [[package]]
+ name = "flate2"
+ version = "1.0.24"
+@@ -693,19 +773,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+ 
+ [[package]]
+ name = "form_urlencoded"
+-version = "1.0.1"
++version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
++checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+ dependencies = [
+- "matches",
+  "percent-encoding",
+ ]
+ 
+ [[package]]
+ name = "futures"
+-version = "0.3.21"
++version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
++checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
+ dependencies = [
+  "futures-channel",
+  "futures-core",
+@@ -718,9 +797,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "futures-channel"
+-version = "0.3.21"
++version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
++checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
+ dependencies = [
+  "futures-core",
+  "futures-sink",
+@@ -728,15 +807,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "futures-core"
+-version = "0.3.21"
++version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
++checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+ 
+ [[package]]
+ name = "futures-executor"
+-version = "0.3.21"
++version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
++checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
+ dependencies = [
+  "futures-core",
+  "futures-task",
+@@ -745,9 +824,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "futures-io"
+-version = "0.3.21"
++version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
++checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
+ 
+ [[package]]
+ name = "futures-lite"
+@@ -766,9 +845,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "futures-macro"
+-version = "0.3.21"
++version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
++checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -777,15 +856,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "futures-sink"
+-version = "0.3.21"
++version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
++checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
+ 
+ [[package]]
+ name = "futures-task"
+-version = "0.3.21"
++version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
++checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+ 
+ [[package]]
+ name = "futures-timer"
+@@ -795,9 +874,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+ 
+ [[package]]
+ name = "futures-util"
+-version = "0.3.21"
++version = "0.3.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
++checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+ dependencies = [
+  "futures-channel",
+  "futures-core",
+@@ -813,9 +892,9 @@ dependencies = [
  
  [[package]]
  name = "generic-array"
@@ -341,7 +577,7 @@ Index: rk/Cargo.lock
  dependencies = [
   "typenum",
   "version_check",
-@@ -809,16 +895,22 @@ dependencies = [
+@@ -834,13 +913,13 @@ dependencies = [
  
  [[package]]
  name = "getrandom"
@@ -358,37 +594,54 @@ Index: rk/Cargo.lock
  ]
  
  [[package]]
-+name = "glob"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-+
-+[[package]]
+@@ -851,9 +930,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+ 
+ [[package]]
  name = "h2"
- version = "0.3.13"
+-version = "0.3.13"
++version = "0.3.14"
  source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -848,9 +940,9 @@ dependencies = [
- 
- [[package]]
- name = "hashbrown"
--version = "0.11.2"
-+version = "0.12.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
- 
- [[package]]
- name = "heck"
-@@ -944,10 +1036,16 @@ dependencies = [
+-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
++checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
+ dependencies = [
+  "bytes",
+  "fnv",
+@@ -877,12 +956,6 @@ dependencies = [
+  "ahash 0.4.7",
  ]
  
+-[[package]]
+-name = "hashbrown"
+-version = "0.11.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+-
  [[package]]
+ name = "hashbrown"
+ version = "0.12.3"
+@@ -964,9 +1037,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "httparse"
+-version = "1.7.1"
++version = "1.8.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
++checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+ 
+ [[package]]
+ name = "httpdate"
+@@ -983,11 +1056,17 @@ dependencies = [
+  "quick-error",
+ ]
+ 
++[[package]]
 +name = "humantime"
 +version = "2.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 +
-+[[package]]
+ [[package]]
  name = "hyper"
 -version = "0.14.19"
 +version = "0.14.20"
@@ -398,7 +651,20 @@ Index: rk/Cargo.lock
  dependencies = [
   "bytes",
   "futures-channel",
-@@ -993,12 +1091,12 @@ dependencies = [
+@@ -1022,23 +1101,22 @@ dependencies = [
+ 
+ [[package]]
+ name = "idna"
+-version = "0.2.3"
++version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
++checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+ dependencies = [
+- "matches",
+  "unicode-bidi",
+  "unicode-normalization",
+ ]
  
  [[package]]
  name = "indexmap"
@@ -414,7 +680,7 @@ Index: rk/Cargo.lock
  ]
  
  [[package]]
-@@ -1024,9 +1122,9 @@ checksum = "879d54834c8c76457ef4293a689b
+@@ -1064,24 +1142,24 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
  
  [[package]]
  name = "itoa"
@@ -426,48 +692,56 @@ Index: rk/Cargo.lock
  
  [[package]]
  name = "jobserver"
-@@ -1039,9 +1137,9 @@ dependencies = [
+-version = "0.1.24"
++version = "0.1.25"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
++checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+ dependencies = [
+  "libc",
+ ]
  
  [[package]]
  name = "js-sys"
 -version = "0.3.57"
-+version = "0.3.59"
++version = "0.3.60"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
-+checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
++checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
  dependencies = [
   "wasm-bindgen",
  ]
-@@ -1054,7 +1152,7 @@ dependencies = [
+@@ -1105,7 +1183,7 @@ dependencies = [
   "actix-web",
   "base64",
   "cfg-if",
 - "clap",
 + "clap 3.1.18",
   "compress-tools",
+  "config",
   "futures",
-  "hex",
-@@ -1092,10 +1190,26 @@ source = "registry+https://github.com/ru
+@@ -1145,11 +1223,27 @@ version = "1.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
  
- [[package]]
++[[package]]
 +name = "lazycell"
 +version = "1.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 +
-+[[package]]
+ [[package]]
  name = "libc"
 -version = "0.2.126"
-+version = "0.2.129"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "64de3cc433455c14174d42e554d4027ee631c4d046d43e3ecc6efc4636cdc7a7"
++version = "0.2.133"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
++checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
 +
 +[[package]]
 +name = "libloading"
 +version = "0.7.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
++source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
 +dependencies = [
 + "cfg-if",
@@ -475,21 +749,44 @@ Index: rk/Cargo.lock
 +]
  
  [[package]]
- name = "local-channel"
-@@ -1175,6 +1289,12 @@ source = "registry+https://github.com/ru
- checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+ name = "linked-hash-map"
+@@ -1177,9 +1271,9 @@ checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1"
  
  [[package]]
-+name = "minimal-lexical"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-+
-+[[package]]
- name = "miniz_oxide"
- version = "0.5.3"
+ name = "lock_api"
+-version = "0.4.7"
++version = "0.4.9"
  source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -1185,9 +1305,9 @@ dependencies = [
+-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
++checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+ dependencies = [
+  "autocfg",
+  "scopeguard",
+@@ -1194,12 +1288,6 @@ dependencies = [
+  "cfg-if",
+ ]
+ 
+-[[package]]
+-name = "matches"
+-version = "0.1.9"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+-
+ [[package]]
+ name = "mbox"
+ version = "0.6.0"
+@@ -1242,18 +1330,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+ 
+ [[package]]
+ name = "miniz_oxide"
+-version = "0.5.3"
++version = "0.5.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
++checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
+ dependencies = [
+  "adler",
+ ]
  
  [[package]]
  name = "mio"
@@ -501,32 +798,15 @@ Index: rk/Cargo.lock
  dependencies = [
   "libc",
   "log",
-@@ -1214,6 +1334,16 @@ dependencies = [
- ]
- 
- [[package]]
-+name = "nom"
-+version = "7.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
-+dependencies = [
-+ "memchr",
-+ "minimal-lexical",
-+]
-+
-+[[package]]
- name = "num-derive"
- version = "0.3.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -1263,15 +1393,15 @@ dependencies = [
+@@ -1339,15 +1427,15 @@ dependencies = [
  
  [[package]]
  name = "once_cell"
 -version = "1.12.0"
-+version = "1.13.0"
++version = "1.15.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
-+checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
++checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
  
  [[package]]
  name = "openssl"
@@ -538,7 +818,7 @@ Index: rk/Cargo.lock
  dependencies = [
   "bitflags",
   "cfg-if",
-@@ -1301,9 +1431,9 @@ checksum = "ff011a302c396a5197692431fc19
+@@ -1377,9 +1465,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
  
  [[package]]
  name = "openssl-sys"
@@ -550,51 +830,51 @@ Index: rk/Cargo.lock
  dependencies = [
   "autocfg",
   "cc",
-@@ -1324,9 +1454,9 @@ dependencies = [
+@@ -1410,9 +1498,9 @@ dependencies = [
  
  [[package]]
  name = "os_str_bytes"
 -version = "6.1.0"
-+version = "6.2.0"
++version = "6.3.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
-+checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
++checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
  
  [[package]]
  name = "parking"
-@@ -1359,9 +1489,15 @@ dependencies = [
+@@ -1445,9 +1533,9 @@ dependencies = [
  
  [[package]]
  name = "paste"
 -version = "1.0.7"
-+version = "1.0.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22"
-+
++version = "1.0.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
++checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+ 
+ [[package]]
+ name = "pathdiff"
+@@ -1455,11 +1543,17 @@ version = "0.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+ 
 +[[package]]
 +name = "peeking_take_while"
 +version = "0.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
++source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
- 
++
  [[package]]
  name = "percent-encoding"
-@@ -1371,10 +1507,11 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29
+-version = "2.1.0"
++version = "2.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
++checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
  
  [[package]]
  name = "pest"
--version = "2.1.3"
-+version = "2.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-+checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8"
- dependencies = [
-+ "thiserror",
-  "ucd-trie",
- ]
- 
-@@ -1465,7 +1602,7 @@ version = "0.4.0"
+@@ -1592,7 +1686,7 @@ version = "0.4.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
  dependencies = [
@@ -603,19 +883,19 @@ Index: rk/Cargo.lock
   "log",
  ]
  
-@@ -1495,9 +1632,9 @@ dependencies = [
+@@ -1622,9 +1716,9 @@ dependencies = [
  
  [[package]]
  name = "proc-macro2"
 -version = "1.0.39"
-+version = "1.0.43"
++version = "1.0.44"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
-+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
++checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
  dependencies = [
   "unicode-ident",
  ]
-@@ -1510,9 +1647,9 @@ checksum = "a1d01941d82fa2ab50be1e79e671
+@@ -1637,9 +1731,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
  
  [[package]]
  name = "quote"
@@ -627,16 +907,40 @@ Index: rk/Cargo.lock
  dependencies = [
   "proc-macro2",
  ]
-@@ -1576,7 +1713,7 @@ version = "0.6.3"
+@@ -1665,7 +1759,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+ dependencies = [
+  "libc",
+  "rand_chacha 0.3.1",
+- "rand_core 0.6.3",
++ "rand_core 0.6.4",
+ ]
+ 
+ [[package]]
+@@ -1685,7 +1779,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+ dependencies = [
+  "ppv-lite86",
+- "rand_core 0.6.3",
++ "rand_core 0.6.4",
+ ]
+ 
+ [[package]]
+@@ -1699,11 +1793,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "rand_core"
+-version = "0.6.3"
++version = "0.6.4"
  source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
  dependencies = [
 - "getrandom 0.2.6",
 + "getrandom 0.2.7",
  ]
  
  [[package]]
-@@ -1590,18 +1727,18 @@ dependencies = [
+@@ -1717,18 +1811,18 @@ dependencies = [
  
  [[package]]
  name = "redox_syscall"
@@ -659,7 +963,7 @@ Index: rk/Cargo.lock
  dependencies = [
   "aho-corasick",
   "memchr",
-@@ -1610,9 +1747,9 @@ dependencies = [
+@@ -1737,9 +1831,9 @@ dependencies = [
  
  [[package]]
  name = "regex-syntax"
@@ -671,19 +975,31 @@ Index: rk/Cargo.lock
  
  [[package]]
  name = "remove_dir_all"
-@@ -1625,9 +1762,9 @@ dependencies = [
+@@ -1752,9 +1846,9 @@ dependencies = [
  
  [[package]]
  name = "reqwest"
 -version = "0.11.10"
-+version = "0.11.11"
++version = "0.11.12"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb"
-+checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
++checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc"
  dependencies = [
   "base64",
   "bytes",
-@@ -1652,6 +1789,7 @@ dependencies = [
+@@ -1768,10 +1862,10 @@ dependencies = [
+  "hyper-tls",
+  "ipnet",
+  "js-sys",
+- "lazy_static",
+  "log",
+  "mime",
+  "native-tls",
++ "once_cell",
+  "percent-encoding",
+  "pin-project-lite",
+  "serde",
+@@ -1779,6 +1873,7 @@ dependencies = [
   "serde_urlencoded",
   "tokio",
   "tokio-native-tls",
@@ -691,25 +1007,25 @@ Index: rk/Cargo.lock
   "url",
   "wasm-bindgen",
   "wasm-bindgen-futures",
-@@ -1676,6 +1814,12 @@ dependencies = [
+@@ -1823,6 +1918,12 @@ dependencies = [
+  "ordered-multimap 0.4.3",
  ]
  
- [[package]]
++[[package]]
 +name = "rustc-hash"
 +version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 +
-+[[package]]
+ [[package]]
  name = "rustc_version"
  version = "0.3.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -1690,14 +1834,14 @@ version = "0.4.0"
+@@ -1838,14 +1939,14 @@ version = "0.4.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
  dependencies = [
 - "semver 1.0.9",
-+ "semver 1.0.13",
++ "semver 1.0.14",
  ]
  
  [[package]]
@@ -722,27 +1038,39 @@ Index: rk/Cargo.lock
  
  [[package]]
  name = "schannel"
-@@ -1749,9 +1893,9 @@ dependencies = [
+@@ -1865,9 +1966,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+ 
+ [[package]]
+ name = "security-framework"
+-version = "2.6.1"
++version = "2.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
++checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+ dependencies = [
+  "bitflags",
+  "core-foundation",
+@@ -1897,9 +1998,9 @@ dependencies = [
  
  [[package]]
  name = "semver"
 -version = "1.0.9"
-+version = "1.0.13"
++version = "1.0.14"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
-+checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
++checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
  
  [[package]]
  name = "semver-parser"
-@@ -1764,27 +1908,27 @@ dependencies = [
+@@ -1912,27 +2013,27 @@ dependencies = [
  
  [[package]]
  name = "serde"
 -version = "1.0.137"
-+version = "1.0.143"
++version = "1.0.145"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
-+checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
++checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
  dependencies = [
   "serde_derive",
  ]
@@ -761,53 +1089,57 @@ Index: rk/Cargo.lock
  [[package]]
  name = "serde_derive"
 -version = "1.0.137"
-+version = "1.0.143"
++version = "1.0.145"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
-+checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
++checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
  dependencies = [
   "proc-macro2",
   "quote",
-@@ -1793,9 +1937,9 @@ dependencies = [
+@@ -1941,9 +2042,9 @@ dependencies = [
  
  [[package]]
  name = "serde_json"
 -version = "1.0.81"
-+version = "1.0.83"
++version = "1.0.85"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
-+checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
++checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
  dependencies = [
   "itoa",
   "ryu",
-@@ -1826,10 +1970,10 @@ dependencies = [
+@@ -1973,17 +2074,6 @@ dependencies = [
+  "serde",
  ]
  
- [[package]]
+-[[package]]
 -name = "sha-1"
 -version = "0.10.0"
-+name = "sha1"
-+version = "0.10.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
-+checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f"
- dependencies = [
-  "cfg-if",
-  "cpufeatures",
-@@ -1837,6 +1981,12 @@ dependencies = [
+-dependencies = [
+- "cfg-if",
+- "cpufeatures",
+- "digest",
+-]
+-
+ [[package]]
+ name = "sha1"
+ version = "0.10.5"
+@@ -1995,6 +2085,12 @@ dependencies = [
+  "digest",
  ]
  
- [[package]]
++[[package]]
 +name = "shlex"
 +version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 +
-+[[package]]
+ [[package]]
  name = "signal-hook-registry"
  version = "1.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -1847,15 +1997,18 @@ dependencies = [
+@@ -2006,21 +2102,24 @@ dependencies = [
  
  [[package]]
  name = "slab"
@@ -830,34 +1162,44 @@ Index: rk/Cargo.lock
  
  [[package]]
  name = "socket2"
-@@ -1881,15 +2034,21 @@ checksum = "a2eb9349b6444b326872e140eb1c
+-version = "0.4.4"
++version = "0.4.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
++checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+ dependencies = [
+  "libc",
+  "winapi",
+@@ -2038,6 +2137,12 @@ version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
  
- [[package]]
- name = "strsim"
++[[package]]
++name = "strsim"
 +version = "0.8.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 +
-+[[package]]
-+name = "strsim"
+ [[package]]
+ name = "strsim"
  version = "0.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+@@ -2046,9 +2151,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
  
  [[package]]
  name = "syn"
 -version = "1.0.96"
-+version = "1.0.99"
++version = "1.0.100"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
-+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
++checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e"
  dependencies = [
   "proc-macro2",
   "quote",
-@@ -1939,24 +2098,33 @@ dependencies = [
+@@ -2098,24 +2203,33 @@ dependencies = [
  
  [[package]]
  name = "textwrap"
+-version = "0.15.0"
 +version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
@@ -867,17 +1209,18 @@ Index: rk/Cargo.lock
 +
 +[[package]]
 +name = "textwrap"
- version = "0.15.0"
++version = "0.15.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
++checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
  
  [[package]]
  name = "thiserror"
 -version = "1.0.31"
-+version = "1.0.32"
++version = "1.0.36"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
-+checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
++checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122"
  dependencies = [
   "thiserror-impl",
  ]
@@ -885,40 +1228,52 @@ Index: rk/Cargo.lock
  [[package]]
  name = "thiserror-impl"
 -version = "1.0.31"
-+version = "1.0.32"
++version = "1.0.36"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
-+checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
++checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43"
  dependencies = [
   "proc-macro2",
   "quote",
-@@ -1965,9 +2133,9 @@ dependencies = [
+@@ -2124,9 +2238,9 @@ dependencies = [
  
  [[package]]
  name = "time"
 -version = "0.3.9"
-+version = "0.3.13"
++version = "0.3.14"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
-+checksum = "db76ff9fa4b1458b3c7f077f3ff9887394058460d21e634355b273aaf11eea45"
++checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
  dependencies = [
   "itoa",
   "libc",
-@@ -1998,10 +2166,11 @@ checksum = "cda74da7e1a664f795bb1f8a87ec
+@@ -2157,10 +2271,11 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
  
  [[package]]
  name = "tokio"
 -version = "1.19.2"
-+version = "1.20.1"
++version = "1.21.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
-+checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
++checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
  dependencies = [
 + "autocfg",
   "bytes",
   "libc",
   "memchr",
-@@ -2071,15 +2240,15 @@ checksum = "736b60249cb25337bc196faa43ee
+@@ -2210,9 +2325,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "tokio-util"
+-version = "0.7.3"
++version = "0.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
++checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
+ dependencies = [
+  "bytes",
+  "futures-core",
+@@ -2239,15 +2354,15 @@ dependencies = [
  
  [[package]]
  name = "tower-service"
@@ -938,7 +1293,7 @@ Index: rk/Cargo.lock
  dependencies = [
   "cfg-if",
   "log",
-@@ -2089,9 +2258,9 @@ dependencies = [
+@@ -2257,9 +2372,9 @@ dependencies = [
  
  [[package]]
  name = "tracing-core"
@@ -950,7 +1305,7 @@ Index: rk/Cargo.lock
  dependencies = [
   "once_cell",
  ]
-@@ -2130,6 +2299,7 @@ version = "0.3.0"
+@@ -2298,6 +2413,7 @@ version = "0.3.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "0e2f37914ec4d494d145cfa18bb8429498b238d63c47a08b89d09c1ec2545ff0"
  dependencies = [
@@ -958,50 +1313,68 @@ Index: rk/Cargo.lock
   "pkg-config",
   "target-lexicon",
  ]
-@@ -2142,9 +2312,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f
+@@ -2310,9 +2426,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
  
  [[package]]
  name = "ucd-trie"
 -version = "0.1.3"
-+version = "0.1.4"
++version = "0.1.5"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-+checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c"
++checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
  
  [[package]]
  name = "unicode-bidi"
-@@ -2154,20 +2324,26 @@ checksum = "099b7128301d285f79ddd55b9a83
+@@ -2322,34 +2438,39 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
  
  [[package]]
  name = "unicode-ident"
 -version = "1.0.0"
-+version = "1.0.3"
++version = "1.0.4"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
-+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
++checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
  
  [[package]]
  name = "unicode-normalization"
 -version = "0.1.19"
-+version = "0.1.21"
++version = "0.1.22"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
-+checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
  dependencies = [
   "tinyvec",
  ]
  
- [[package]]
-+name = "unicode-width"
-+version = "0.1.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-+
 +[[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.3"
+-version = "0.2.3"
++version = "0.2.4"
  source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -2192,7 +2368,7 @@ version = "0.8.2"
+-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
++checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+ 
+ [[package]]
+ name = "url"
+-version = "2.2.2"
++version = "2.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
++checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+ dependencies = [
+  "form_urlencoded",
+  "idna",
+- "matches",
+  "percent-encoding",
+  "serde",
+ ]
+@@ -2360,7 +2481,7 @@ version = "0.8.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
  dependencies = [
@@ -1010,52 +1383,53 @@ Index: rk/Cargo.lock
  ]
  
  [[package]]
-@@ -2202,6 +2378,12 @@ source = "registry+https://github.com/ru
+@@ -2369,6 +2490,12 @@ version = "0.2.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
  
- [[package]]
++[[package]]
 +name = "vec_map"
 +version = "0.8.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 +
-+[[package]]
+ [[package]]
  name = "version_check"
  version = "0.9.4"
+@@ -2397,12 +2524,6 @@ version = "0.9.0+wasi-snapshot-preview1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -2231,21 +2413,15 @@ checksum = "cccddf32554fecc6acb585f82a32
+ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
  
- [[package]]
- name = "wasi"
+-[[package]]
+-name = "wasi"
 -version = "0.10.2+wasi-snapshot-preview1"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 -
--[[package]]
--name = "wasi"
+ [[package]]
+ name = "wasi"
  version = "0.11.0+wasi-snapshot-preview1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+@@ -2411,9 +2532,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
  
  [[package]]
  name = "wasm-bindgen"
 -version = "0.2.80"
-+version = "0.2.82"
++version = "0.2.83"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
-+checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
++checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
  dependencies = [
   "cfg-if",
   "wasm-bindgen-macro",
-@@ -2253,13 +2429,13 @@ dependencies = [
+@@ -2421,13 +2542,13 @@ dependencies = [
  
  [[package]]
  name = "wasm-bindgen-backend"
 -version = "0.2.80"
-+version = "0.2.82"
++version = "0.2.83"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
-+checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
++checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
  dependencies = [
   "bumpalo",
 - "lazy_static",
@@ -1064,80 +1438,79 @@ Index: rk/Cargo.lock
   "proc-macro2",
   "quote",
   "syn",
-@@ -2268,9 +2444,9 @@ dependencies = [
+@@ -2436,9 +2557,9 @@ dependencies = [
  
  [[package]]
  name = "wasm-bindgen-futures"
 -version = "0.4.30"
-+version = "0.4.32"
++version = "0.4.33"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
-+checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad"
++checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
  dependencies = [
   "cfg-if",
   "js-sys",
-@@ -2280,9 +2456,9 @@ dependencies = [
+@@ -2448,9 +2569,9 @@ dependencies = [
  
  [[package]]
  name = "wasm-bindgen-macro"
 -version = "0.2.80"
-+version = "0.2.82"
++version = "0.2.83"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
-+checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
++checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
  dependencies = [
   "quote",
   "wasm-bindgen-macro-support",
-@@ -2290,9 +2466,9 @@ dependencies = [
+@@ -2458,9 +2579,9 @@ dependencies = [
  
  [[package]]
  name = "wasm-bindgen-macro-support"
 -version = "0.2.80"
-+version = "0.2.82"
++version = "0.2.83"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
-+checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
++checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
  dependencies = [
   "proc-macro2",
   "quote",
-@@ -2303,21 +2479,32 @@ dependencies = [
+@@ -2471,20 +2592,31 @@ dependencies = [
  
  [[package]]
  name = "wasm-bindgen-shared"
 -version = "0.2.80"
-+version = "0.2.82"
++version = "0.2.83"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
-+checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
++checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
  
  [[package]]
  name = "web-sys"
 -version = "0.3.57"
-+version = "0.3.59"
++version = "0.3.60"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
-+checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
++checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
  dependencies = [
   "js-sys",
   "wasm-bindgen",
  ]
  
- [[package]]
++[[package]]
 +name = "which"
-+version = "4.2.5"
++version = "4.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
++checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
 +dependencies = [
 + "either",
-+ "lazy_static",
 + "libc",
++ "once_cell",
 +]
 +
-+[[package]]
+ [[package]]
  name = "winapi"
  version = "0.3.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -2402,12 +2589,13 @@ dependencies = [
+@@ -2570,12 +2702,13 @@ dependencies = [
  
  [[package]]
  name = "wiremock"
@@ -1153,7 +1526,7 @@ Index: rk/Cargo.lock
   "deadpool",
   "futures",
   "futures-timer",
-@@ -2423,9 +2611,9 @@ dependencies = [
+@@ -2600,9 +2733,9 @@ dependencies = [
  
  [[package]]
  name = "zeroize"
@@ -1165,7 +1538,7 @@ Index: rk/Cargo.lock
  dependencies = [
   "zeroize_derive",
  ]
-@@ -2466,18 +2654,18 @@ dependencies = [
+@@ -2643,18 +2776,18 @@ dependencies = [
  
  [[package]]
  name = "zstd"
@@ -1188,7 +1561,7 @@ Index: rk/Cargo.lock
  dependencies = [
   "libc",
   "zstd-sys",
-@@ -2485,9 +2673,9 @@ dependencies = [
+@@ -2662,9 +2795,9 @@ dependencies = [
  
  [[package]]
  name = "zstd-sys"
@@ -1200,14 +1573,14 @@ Index: rk/Cargo.lock
  dependencies = [
   "cc",
   "libc",
-Index: rk/Cargo.toml
-===================================================================
---- rk.orig/Cargo.toml
-+++ rk/Cargo.toml
-@@ -39,7 +39,7 @@ serde_json = { version = "1.0", features
- static_assertions = "1"
+diff --git a/Cargo.toml b/Cargo.toml
+index ddcb2a29..af1df5ef 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -42,7 +42,7 @@ static_assertions = "1"
  tempfile = "3.0.4"
  tokio = {version = "1.13.1", features = ["full"]}
+ toml = "0.5"
 -tss-esapi = "7.1.0"
 +tss-esapi = {version = "7.1.0", features = ["generate-bindings"]}
  thiserror = "1.0"
diff --git a/keylime-agent.conf.diff b/keylime-agent.conf.diff
index eba81da..9dc1284 100644
--- a/keylime-agent.conf.diff
+++ b/keylime-agent.conf.diff
@@ -1,34 +1,39 @@
-Index: rust-keylime-0.1.0+git.1659977521.0186093/keylime-agent.conf
+Index: rust-keylime-0.1.0+git.1663769444.6318234/keylime-agent.conf
 ===================================================================
---- rust-keylime-0.1.0+git.1659977521.0186093.orig/keylime-agent.conf
-+++ rust-keylime-0.1.0+git.1659977521.0186093/keylime-agent.conf
-@@ -4,7 +4,8 @@
- 
- # Revocation IP & Port used by either the cloud_agent or keylime_ca to receive
- # revocation events from the verifier.
--receive_revocation_ip = 127.0.0.1
-+# receive_revocation_ip = 127.0.0.1
-+receive_revocation_ip = <REMOTE_IP>
- receive_revocation_port = 8992
- 
- 
-@@ -13,7 +14,8 @@ receive_revocation_port = 8992
- #=============================================================================
+--- rust-keylime-0.1.0+git.1663769444.6318234.orig/keylime-agent.conf
++++ rust-keylime-0.1.0+git.1663769444.6318234/keylime-agent.conf
+@@ -10,10 +10,12 @@ version = "2.0"
+ # If you set this to "generate", Keylime will create a random UUID.
+ # If you set this to "hash_ek", Keylime will set the UUID to the result
+ # of 'SHA256(public EK in PEM format)'.
+-uuid = "d432fbb3-d2f1-4a97-9ef7-75bd81c00000"
++# uuid = "d432fbb3-d2f1-4a97-9ef7-75bd81c00000"
++uuid = "generate"
  
  # The binding address and port for the agent server
--cloudagent_ip = 127.0.0.1
-+# cloudagent_ip = 127.0.0.1
-+cloudagent_ip = 0.0.0.0
- cloudagent_port = 9002
+-ip = "127.0.0.1"
++# ip = "127.0.0.1"
++ip = "0.0.0.0"
+ port = 9002
  
  # Address and port where the verifier and tenant can connect to reach the agent.
-@@ -22,7 +24,8 @@ agent_contact_ip = 127.0.0.1
- agent_contact_port = 9002
+@@ -22,7 +24,8 @@ contact_ip = "127.0.0.1"
+ contact_port = 9002
  
  # The address and port of registrar server which agent communicate with
--registrar_ip = 127.0.0.1
-+# registrar_ip = 127.0.0.1
-+registrar_ip = <REMOTE_IP>
+-registrar_ip = "127.0.0.1"
++# registrar_ip = "127.0.0.1"
++registrar_ip = "<REMOTE_IP>"
  registrar_port = 8890
  
- # The keylime working directory.  Can be overriden by setting the KEYLIME_DIR
+ # Enable mTLS communication between agent, verifier and tenant.
+@@ -96,7 +99,8 @@ revocation_actions_dir = "/usr/libexec/k
+ # Revocation IP & Port used by the agent to receive revocation
+ # notifications from the verifier via zeromq.
+ # This is optional and used only when 'enable_revocation_notifications' is 'true'.
+-revocation_notification_ip = "127.0.0.1"
++# revocation_notification_ip = "127.0.0.1"
++revocation_notification_ip = "<REMOTE_IP>"
+ revocation_notification_port = 8992
+ 
+ # The path to the certificate to verify revocation messages received from the
diff --git a/keylime.xml b/keylime.xml
index d970af5..2902ad8 100644
--- a/keylime.xml
+++ b/keylime.xml
@@ -2,7 +2,6 @@
 <service>
   <short>Keylime</short>
   <description>Keylime is a remote attestation tool that requires access to several ports.</description>
-  <port protocol="tcp" port="443"/><!-- Webapp -->
   <port protocol="tcp" port="8881"/><!-- Verifier -->
   <port protocol="tcp" port="8890"/><!-- Registrar -->
   <port protocol="tcp" port="8891"/><!-- Registrar TLS -->
diff --git a/rust-keylime-0.1.0+git.1659977521.0186093.tar.xz b/rust-keylime-0.1.0+git.1659977521.0186093.tar.xz
deleted file mode 100644
index 90a10e6..0000000
--- a/rust-keylime-0.1.0+git.1659977521.0186093.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6e878e1b8ba3106f7ce152fd227fc2f6a3b17c6ffc98fc9a3093a41e6327336
-size 119944
diff --git a/rust-keylime-0.1.0+git.1663769444.6318234.tar.xz b/rust-keylime-0.1.0+git.1663769444.6318234.tar.xz
new file mode 100644
index 0000000..3f0f578
--- /dev/null
+++ b/rust-keylime-0.1.0+git.1663769444.6318234.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6044f08a59635a4b7b1801708261334259f72b63095fc44bc5fd37ccb5853d8f
+size 122752
diff --git a/rust-keylime.changes b/rust-keylime.changes
index 9fd4371..8c0428a 100644
--- a/rust-keylime.changes
+++ b/rust-keylime.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Sep 26 14:15:04 UTC 2022 - aplanas@suse.com
+
+- Rebase bindgen.patch and upstream the change
+- Rebase keylime-agent.conf.diff
+- Store the configuration file in /usr/etc/keylime/agent.conf
+- Fix keylime user creation
+- Drop webapp service port in firewall XML service file
+- Update to version 0.1.0+git.1663769444.6318234:
+  * Update comments in the configuration file
+  * config: Align config locations with the python components
+  * config: Add configuration file version
+  * config: Add back support for KEYLIME_DIR env var
+  * Change configuration format to TOML
+  * Add support for using passphrase protected key
+  * Do not try to load TPM data generated by another TPM
+  * Allow using existing key and certificate
+  * Remove the agent TPM data from the config struct
+  * Rename the configuration options
+  * Use password to generate EK when provided
+  * Add tpm_ownerpassword option to keylime.conf
+  * Add cargo audit to CI static tests
+  * Add agent and faked_measured_boot_log tests context
+  * Appease clippy
+
 -------------------------------------------------------------------
 Wed Aug 10 13:39:08 UTC 2022 - aplanas@suse.com
 
diff --git a/rust-keylime.spec b/rust-keylime.spec
index 1049b7d..5a10ba3 100644
--- a/rust-keylime.spec
+++ b/rust-keylime.spec
@@ -25,7 +25,7 @@
   %define _config_norepl %config(noreplace)
 %endif
 Name:           rust-keylime
-Version:        0.1.0+git.1659977521.0186093
+Version:        0.1.0+git.1663769444.6318234
 Release:        0
 Summary:        Rust implementation of the keylime agent
 License:        Apache-2.0 AND MIT
@@ -38,7 +38,7 @@ Source4:        keylime-user.conf
 Source5:        tmpfiles.keylime
 # PATCH-FIX-OPENSUSE keylime-agent.conf.diff
 Patch1:         keylime-agent.conf.diff
-# PATCH-FIX-OPENSUSE bindgen.patch
+# PATCH-FIX-UPSTREAM bindgen.patch -- gh#keylime/rust-keylime!459
 Patch2:         bindgen.patch
 BuildRequires:  cargo
 BuildRequires:  clang
@@ -51,6 +51,8 @@ BuildRequires:  zeromq-devel
 Requires:       libtss2-tcti-device0
 Requires:       logrotate
 Requires:       tpm2.0-abrmd
+Provides:       user(keylime)
+%sysusers_requires
 
 %description
 Rust implementation of keylime agent. Keylime is system integrity
@@ -68,8 +70,7 @@ RUSTFLAGS=%{rustflags} cargo build --release --no-default-features --features "w
 %install
 RUSTFLAGS=%{rustflags} cargo install --frozen --no-default-features --features "with-zmq" --root=%{buildroot}%{_prefix} --path .
 
-# TODO: move the configuration file into _distconfdir
-install -Dpm 0600 keylime-agent.conf %{buildroot}%{_sysconfdir}/keylime-agent.conf
+install -Dpm 0600 keylime-agent.conf %{buildroot}%{_distconfdir}/keylime/agent.conf
 install -Dpm 0644 ./dist/systemd/system/keylime_agent.service %{buildroot}%{_unitdir}/keylime_agent.service
 install -Dpm 0644 ./dist/systemd/system/var-lib-keylime-secure.mount %{buildroot}%{_unitdir}/var-lib-keylime-secure.mount
 
@@ -85,7 +86,7 @@ mkdir -p %{buildroot}%{_sharedstatedir}/keylime
 rm %{buildroot}%{_prefix}/.crates.toml
 rm %{buildroot}%{_prefix}/.crates2.json
 
-%pre
+%pre -f keylime.pre
 %service_add_pre keylime_agent.service
 %service_add_pre var-lib-keylime-secure.mount
 
@@ -108,7 +109,8 @@ rm %{buildroot}%{_prefix}/.crates2.json
 %license LICENSE
 %{_bindir}/keylime_agent
 %{_bindir}/keylime_ima_emulator
-%config(noreplace) %attr (0600,keylime,tss) %{_sysconfdir}/keylime-agent.conf
+%dir %attr(0700,keylime,tss) %{_distconfdir}/keylime
+%_config_norepl %attr (0600,keylime,tss) %{_distconfdir}/keylime/agent.conf
 %{_unitdir}/keylime_agent.service
 %{_unitdir}/var-lib-keylime-secure.mount
 %dir %{_prefix}/lib/firewalld
diff --git a/vendor.tar.xz b/vendor.tar.xz
index 1efec65..aaade8f 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fcc10303f90db5ff1485a76892b1c7eef8904d848e26e67af928eeb96c071aa4
-size 20796756
+oid sha256:95bb3976b462d1619f87de02826cc1714d909c801f95c5144bb0cf10ca5a1294
+size 21085344