From e4e84e621cef3c7fdbc1a18ac4a5c1a4ed1a3dfb Mon Sep 17 00:00:00 2001
From: Dmitry Pankratov <dmitry@pankratov.net>
Date: Fri, 9 Aug 2024 10:52:55 +0200
Subject: [PATCH] Version 2.3.0, updated isakmp dependency

---
 Cargo.lock                            | 30 +++++++++++++--------------
 Cargo.toml                            |  4 ++--
 snxcore/src/tunnel/ipsec/connector.rs |  1 +
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 660f9f3..4c70ccb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -420,9 +420,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
+checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549"
 
 [[package]]
 name = "cfg-expr"
@@ -473,9 +473,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.13"
+version = "4.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
+checksum = "c937d4061031a6d0c8da4b9a4f98a172fc2976dfb1c19213a9cf7d0d3c837e36"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -483,9 +483,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.13"
+version = "4.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
+checksum = "85379ba512b21a328adf887e85f7742d12e96eb31f3ef077df4ffc26b506ffed"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1507,7 +1507,7 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 [[package]]
 name = "isakmp"
 version = "0.1.0"
-source = "git+https://github.com/ancwrd1/isakmp.git#2a1427286425d463d4b81503aed5ed11b61c560e"
+source = "git+https://github.com/ancwrd1/isakmp.git#feaa097bfc636ed58cbdc400f5c0f7c110595625"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2545,18 +2545,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.205"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.205"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2676,7 +2676,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "snx-rs"
-version = "2.2.8"
+version = "2.3.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -2691,7 +2691,7 @@ dependencies = [
 
 [[package]]
 name = "snx-rs-gui"
-version = "2.2.8"
+version = "2.3.0"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -2713,7 +2713,7 @@ dependencies = [
 
 [[package]]
 name = "snxcore"
-version = "2.2.8"
+version = "2.3.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -2754,7 +2754,7 @@ dependencies = [
 
 [[package]]
 name = "snxctl"
-version = "2.2.8"
+version = "2.3.0"
 dependencies = [
  "anyhow",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 42c35f9..b7415f4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [workspace]
-members = [ "snxcore", "snxctl", "snx-rs", "snx-rs-gui" ]
+members = ["snxcore", "snxctl", "snx-rs", "snx-rs-gui"]
 resolver = "2"
 
 [workspace.package]
-version = "2.2.8"
+version = "2.3.0"
 license = "AGPL-3.0"
 edition = "2021"
 authors = ["Dmitry Pankratov <dmitry@pankratov.net>"]
diff --git a/snxcore/src/tunnel/ipsec/connector.rs b/snxcore/src/tunnel/ipsec/connector.rs
index a6fc516..52589c6 100644
--- a/snxcore/src/tunnel/ipsec/connector.rs
+++ b/snxcore/src/tunnel/ipsec/connector.rs
@@ -399,6 +399,7 @@ impl TunnelConnector for IpsecTunnelConnector {
 
         self.service
             .do_identity_protection(
+                self.gateway_address,
                 Bytes::copy_from_slice(realm_expr.to_string().as_bytes()),
                 self.params.ipsec_cert_check,
                 &self.params.ca_cert,