Merge branch 'master' of git.e3t.cc:core/trifid

Cargo.lock

@@ -1214,7 +1214,7 @@ dependencies = [
 
 [[package]]
 name = "dnapi-rs"
-version = "0.1.14"
+version = "0.1.15"
 dependencies = [
  "base64 0.21.2",
  "base64-serde",
@@ -3574,7 +3574,7 @@ dependencies = [
 
 [[package]]
 name = "tfclient"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "base64 0.21.2",
  "base64-serde",

dnapi-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dnapi-rs"
-version = "0.1.14"
+version = "0.1.15"
 edition = "2021"
 description = "A rust client for the Defined Networking API"
 license = "AGPL-3.0-or-later"

dnapi-rs/src/client_blocking.rs

@@ -254,6 +254,7 @@ impl Client {
 
         ed_privkey.verify(b64_msg_bytes, &Signature::from_slice(&signature)?)?;
         debug!("signature valid via clientside check");
+        debug!("signed with key: {:x?}", ed_privkey.verifying_key().as_bytes());
 
         let body = RequestV1 {
             version: 1,

tfclient/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tfclient"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 description = "An open-source reimplementation of a Defined Networking-compatible client"
 license = "GPL-3.0-or-later"

trifid-api/src/routes/v2/enroll.rs

@@ -103,6 +103,8 @@ pub async fn enroll(
         }
     };
 
+    debug!("keys: DH: {:x?} ED: {:x?}", dh_pubkey, ed_pubkey);
+
     // destroy the enrollment code before doing anything else
 
     match enroll_info.clone().delete(&db.conn).await {