merge develop into master #20

Merged
michael-bailey merged 181 commits from develop into master 2023-12-01 21:48:28 +00:00
3 changed files with 7 additions and 0 deletions
Showing only changes of commit 137ef3d3b1 - Show all commits

View File

@ -22,4 +22,7 @@ url = "2.2.0"
uuid = {version = "0.8", features = ["serde", "v4"]}
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
ring = "0.16.20"
sodiumoxide = "0.2.6"

View File

@ -3,10 +3,12 @@ pub mod prelude;
use serde::{Deserialize, Serialize};
use uuid::Uuid;
// use ring::signature::RsaPublicKeyComponents;
#[derive(Deserialize, Serialize, Debug, Clone)]
pub struct ClientDetails {
pub uuid: Uuid,
pub username: String,
pub address: String,
// pub public_key: Option<RsaPublicKeyComponents<>>,
}

View File

@ -14,5 +14,7 @@ serde_json = "1.0"
crossbeam = "0.8.0"
crossbeam-channel = "0.5.0"
zeroize = "1.1.0"
ring = "0.16.20"
sodiumoxide = "0.2.6"
foundation = {path = '../foundation'}