zerotier/identity
0
0
Fork 0
mirror of https://github.com/zerotier/identity.git synced 2026-05-22 16:29:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

rustfmt

Browse Source
This commit is contained in:
Adam Ierymenko
2023-08-07 14:36:58 -04:00
parent e1f5eb9169
commit 2443abf3c6
5 changed files with 70 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfmt.toml
+1 -1
View File
@@ -1,5 +1,5 @@
#unstable_features = true
max_width = 150
max_width = 120
#use_small_heuristics = "Max"
edition = "2021"
#empty_item_single_line = true
src/base24.rs
+2 -1
View File
@@ -11,7 +11,8 @@ use zerotier_common_utils::error::InvalidParameterError;
/// All unambiguous letters, thus easy to type on the alphabetic keyboards on phones without extra shift taps.
/// The letters 'l' and 'u' are skipped.
const BASE24_ALPHABET: [u8; 24] = [
b'a', b'b', b'c', b'd', b'e', b'f', b'g', b'h', b'i', b'j', b'k', b'm', b'n', b'o', b'p', b'q', b'r', b's', b't', b'v', b'w', b'x', b'y', b'z',
b'a', b'b', b'c', b'd', b'e', b'f', b'g', b'h', b'i', b'j', b'k', b'm', b'n', b'o', b'p', b'q', b'r', b's', b't',
b'v', b'w', b'x', b'y', b'z',
];
/// Reverse table for BASE24 alphabet, indexed relative to 'a' or 'A'.
src/lib.rs
+18 -2
View File
@@ -16,13 +16,29 @@ use zerotier_common_utils::error::InvalidParameterError;
use zerotier_common_utils::tofrombytes::ToFromBytes;
/// A unique global identifier for a ZeroTier identity.
pub trait Address: ToString + FromStr + ToFromBytes + Sync + Send + Clone + PartialEq + Eq + Hash + PartialOrd + Ord + AsRef<[u8]> + 'static {
pub trait Address:
ToString
+ FromStr
+ ToFromBytes
+ Sync
+ Send
+ Clone
+ PartialEq
+ Eq
+ Hash
+ PartialOrd
+ Ord
+ AsRef<[u8]>
+ 'static
{
/// Size of this address in bytes.
const SIZE: usize;
}
/// A bundle of public key(s) securely identifying a participant on the network.
pub trait Identity: ToString + FromStr + ToFromBytes + Sync + Send + Clone + PartialEq + Eq + Hash + PartialOrd + Ord + 'static {
pub trait Identity:
ToString + FromStr + ToFromBytes + Sync + Send + Clone + PartialEq + Eq + Hash + PartialOrd + Ord + 'static
{
/// Number of bytes in this identity's byte serialized representation.
const SIZE: usize;
src/p384.rs
+34 -12
View File
@@ -303,14 +303,20 @@ impl PartialOrd for ShortAddress {
impl Ord for Address {
#[inline(always)]
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
self.0.iter().map(|i| u64::from_be(*i)).cmp(other.0.iter().map(|i| u64::from_be(*i)))
self.0
.iter()
.map(|i| u64::from_be(*i))
.cmp(other.0.iter().map(|i| u64::from_be(*i)))
}
}
impl Ord for ShortAddress {
#[inline(always)]
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
self.0.iter().map(|i| u64::from_be(*i)).cmp(other.0.iter().map(|i| u64::from_be(*i)))
self.0
.iter()
.map(|i| u64::from_be(*i))
.cmp(other.0.iter().map(|i| u64::from_be(*i)))
}
}
@@ -337,7 +343,8 @@ impl<'de> Deserialize<'de> for Address {
if deserializer.is_human_readable() {
Address::from_str(<&str>::deserialize(deserializer)?).map_err(|_| serde::de::Error::custom(ADDRESS_ERR.0))
} else {
Address::try_from(<[u8; 48]>::from(Blob::<48>::deserialize(deserializer)?)).map_err(|_| serde::de::Error::custom(ADDRESS_ERR.0))
Address::try_from(<[u8; 48]>::from(Blob::<48>::deserialize(deserializer)?))
.map_err(|_| serde::de::Error::custom(ADDRESS_ERR.0))
}
}
}
@@ -363,9 +370,11 @@ impl<'de> Deserialize<'de> for ShortAddress {
D: Deserializer<'de>,
{
if deserializer.is_human_readable() {
ShortAddress::from_str(<&str>::deserialize(deserializer)?).map_err(|_| serde::de::Error::custom(ADDRESS_ERR.0))
ShortAddress::from_str(<&str>::deserialize(deserializer)?)
.map_err(|_| serde::de::Error::custom(ADDRESS_ERR.0))
} else {
ShortAddress::try_from(<[u8; 16]>::from(Blob::<16>::deserialize(deserializer)?)).map_err(|_| serde::de::Error::custom(ADDRESS_ERR.0))
ShortAddress::try_from(<[u8; 16]>::from(Blob::<16>::deserialize(deserializer)?))
.map_err(|_| serde::de::Error::custom(ADDRESS_ERR.0))
}
}
}
@@ -392,7 +401,10 @@ impl Identity {
sign_tmp.push_slice(&self.timestamp.to_be_bytes());
sign_tmp.push_slice(self.ecdh.as_bytes());
sign_tmp.push_slice(self.ecdsa.as_bytes());
self.address.is_valid() && self.master_signing_key.verify(sign_tmp.as_bytes(), &self.master_signature)
self.address.is_valid()
&& self
.master_signing_key
.verify(sign_tmp.as_bytes(), &self.master_signature)
}
/// Returns true if this identity should replace the other.
@@ -430,13 +442,15 @@ impl FromStr for Identity {
impl ToFromBytes for Identity {
fn read_bytes<R: std::io::Read>(r: &mut R) -> std::io::Result<Self> {
let mut tmp = [0u8; P384_PUBLIC_KEY_SIZE + 8 + P384_PUBLIC_KEY_SIZE + P384_PUBLIC_KEY_SIZE + P384_ECDSA_SIGNATURE_SIZE];
let mut tmp =
[0u8; P384_PUBLIC_KEY_SIZE + 8 + P384_PUBLIC_KEY_SIZE + P384_PUBLIC_KEY_SIZE + P384_ECDSA_SIGNATURE_SIZE];
r.read_exact(&mut tmp)?;
if let (Some(master_signing_key), Some(ecdh), Some(ecdsa)) = (
P384PublicKey::from_bytes(&tmp[..P384_PUBLIC_KEY_SIZE]),
P384PublicKey::from_bytes(&tmp[P384_PUBLIC_KEY_SIZE + 8..P384_PUBLIC_KEY_SIZE + 8 + P384_PUBLIC_KEY_SIZE]),
P384PublicKey::from_bytes(
&tmp[P384_PUBLIC_KEY_SIZE + 8 + P384_PUBLIC_KEY_SIZE..P384_PUBLIC_KEY_SIZE + 8 + P384_PUBLIC_KEY_SIZE + P384_PUBLIC_KEY_SIZE],
&tmp[P384_PUBLIC_KEY_SIZE + 8 + P384_PUBLIC_KEY_SIZE
..P384_PUBLIC_KEY_SIZE + 8 + P384_PUBLIC_KEY_SIZE + P384_PUBLIC_KEY_SIZE],
),
) {
let id = Self {
@@ -501,7 +515,8 @@ impl Hash for Identity {
}
impl crate::Identity for Identity {
const SIZE: usize = P384_PUBLIC_KEY_SIZE + 8 + P384_PUBLIC_KEY_SIZE + P384_PUBLIC_KEY_SIZE + P384_ECDSA_SIGNATURE_SIZE;
const SIZE: usize =
P384_PUBLIC_KEY_SIZE + 8 + P384_PUBLIC_KEY_SIZE + P384_PUBLIC_KEY_SIZE + P384_ECDSA_SIGNATURE_SIZE;
const SIGNATURE_SIZE: usize = P384_ECDSA_SIGNATURE_SIZE;
type Secret = IdentitySecret;
@@ -559,7 +574,10 @@ impl Serialize for IdentitySecret {
IdentitySecretSerialized {
a: self.public.address,
pm: (*self.public.master_signing_key.as_bytes()).into(),
sm: self.master_signing_key.as_ref().map(|sk| (*sk.secret_key_bytes().as_bytes()).into()),
sm: self
.master_signing_key
.as_ref()
.map(|sk| (*sk.secret_key_bytes().as_bytes()).into()),
ts: self.public.timestamp,
p0: (*self.public.ecdh.as_bytes()).into(),
s0: (*self.ecdh.secret_key_bytes().as_bytes()).into(),
@@ -696,7 +714,9 @@ mod tests {
assert!(p384::Address::from_str(secret.public.address.to_string().as_str())
.unwrap()
.eq(&secret.public.address));
assert!(p384::Identity::from_str(secret.public.to_string().as_str()).unwrap().eq(&secret.public));
assert!(p384::Identity::from_str(secret.public.to_string().as_str())
.unwrap()
.eq(&secret.public));
}
#[test]
@@ -708,6 +728,8 @@ mod tests {
assert!(p384::Identity::from_bytes(secret.public.to_bytes().as_slice())
.unwrap()
.eq(&secret.public));
assert!(p384::IdentitySecret::from_bytes(secret.to_bytes().as_slice()).unwrap().eq(&secret));
assert!(p384::IdentitySecret::from_bytes(secret.to_bytes().as_slice())
.unwrap()
.eq(&secret));
}
}
src/x25519.rs
+15 -6
View File
@@ -283,7 +283,8 @@ impl<'de> Deserialize<'de> for Identity {
if deserializer.is_human_readable() {
Identity::from_str(<&str>::deserialize(deserializer)?).map_err(|_| serde::de::Error::custom(IDENTITY_ERR.0))
} else {
Identity::from_bytes(<&[u8]>::deserialize(deserializer)?).map_err(|_| serde::de::Error::custom(IDENTITY_ERR.0))
Identity::from_bytes(<&[u8]>::deserialize(deserializer)?)
.map_err(|_| serde::de::Error::custom(IDENTITY_ERR.0))
}
}
}
@@ -323,8 +324,10 @@ impl FromStr for IdentitySecret {
if secret_bytes.len() != C25519_SECRET_KEY_SIZE + ED25519_SECRET_KEY_SIZE {
return Err(IDENTITY_ERR);
}
let ecdh = X25519KeyPair::from_bytes(&public.ecdh, &secret_bytes.as_slice()[..C25519_SECRET_KEY_SIZE]).ok_or(IDENTITY_ERR)?;
let eddsa = Ed25519KeyPair::from_bytes(&public.eddsa, &secret_bytes.as_slice()[C25519_SECRET_KEY_SIZE..]).ok_or(IDENTITY_ERR)?;
let ecdh = X25519KeyPair::from_bytes(&public.ecdh, &secret_bytes.as_slice()[..C25519_SECRET_KEY_SIZE])
.ok_or(IDENTITY_ERR)?;
let eddsa = Ed25519KeyPair::from_bytes(&public.eddsa, &secret_bytes.as_slice()[C25519_SECRET_KEY_SIZE..])
.ok_or(IDENTITY_ERR)?;
return Ok(Self { public, ecdh, eddsa });
}
}
@@ -514,8 +517,12 @@ mod tests {
assert!(x25519::Address::from_str(secret.public.address.to_string().as_str())
.unwrap()
.eq(&secret.public.address));
assert!(x25519::Identity::from_str(secret.public.to_string().as_str()).unwrap().eq(&secret.public));
assert!(x25519::IdentitySecret::from_str(secret.to_string().as_str()).unwrap().eq(&secret));
assert!(x25519::Identity::from_str(secret.public.to_string().as_str())
.unwrap()
.eq(&secret.public));
assert!(x25519::IdentitySecret::from_str(secret.to_string().as_str())
.unwrap()
.eq(&secret));
}
#[test]
@@ -527,7 +534,9 @@ mod tests {
assert!(x25519::Identity::from_bytes(secret.public.to_bytes().as_slice())
.unwrap()
.eq(&secret.public));
assert!(x25519::IdentitySecret::from_bytes(secret.to_bytes().as_slice()).unwrap().eq(&secret));
assert!(x25519::IdentitySecret::from_bytes(secret.to_bytes().as_slice())
.unwrap()
.eq(&secret));
}
#[test]