void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-26 17:03:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1796 from zerotier/bugfix/tetanus-typos

Browse source 
Bugfix/tetanus typos
This commit is contained in:
Adam Ierymenko 2022-11-28 12:44:10 -05:00 • committed by GitHub
commit 6a3b9f9bbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controller/src/cache.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::HashMap; use std::collections::HashMap;
use std::error::Error; use std::error::Error;

2
controller/src/controller.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::HashMap; use std::collections::HashMap;
use std::error::Error; use std::error::Error;

2
controller/src/lib.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
mod controller; mod controller;

2
controller/src/main.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::sync::Arc; use std::sync::Arc;

2
controller/src/model/member.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::hash::Hash; use std::hash::Hash;

2
controller/src/model/mod.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
mod member; mod member;
mod network; mod network;

2
controller/src/model/network.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::hash::Hash; use std::hash::Hash;

2
crypto/src/aes.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
// MacOS implementation of AES primitives since CommonCrypto seems to be faster than OpenSSL, especially on ARM64. // MacOS implementation of AES primitives since CommonCrypto seems to be faster than OpenSSL, especially on ARM64.
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]

2
crypto/src/hash.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::ffi::c_void; use std::ffi::c_void;
use std::io::Write; use std::io::Write;

2
crypto/src/lib.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
pub mod aes; pub mod aes;
pub mod aes_gmac_siv; pub mod aes_gmac_siv;

2
crypto/src/p384.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
#![allow( #![allow(
dead_code, dead_code,

2
crypto/src/poly1305.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use poly1305::universal_hash::KeyInit; use poly1305::universal_hash::KeyInit;

2
crypto/src/random.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::atomic::{AtomicU64, Ordering};

2
crypto/src/salsa.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::convert::TryInto; use std::convert::TryInto;
use std::ptr::{slice_from_raw_parts, slice_from_raw_parts_mut}; use std::ptr::{slice_from_raw_parts, slice_from_raw_parts_mut};

2
crypto/src/secret.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::ffi::c_void; use std::ffi::c_void;

2
crypto/src/verified.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::fmt::Debug; use std::fmt::Debug;
use std::hash::Hash; use std::hash::Hash;

2
crypto/src/x25519.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::convert::TryInto; use std::convert::TryInto;
use std::io::Write; use std::io::Write;

6
crypto/src/zssp.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
// ZSSP: ZeroTier Secure Session Protocol // ZSSP: ZeroTier Secure Session Protocol
// FIPS compliant Noise_IK with Jedi powers and built-in attack-resistant large payload (fragmentation) support. // FIPS compliant Noise_IK with Jedi powers and built-in attack-resistant large payload (fragmentation) support.
@ -131,7 +131,7 @@ pub enum Error {
/// Packet was not well formed /// Packet was not well formed
InvalidPacket, InvalidPacket,
/// An invalid paramter was supplied to the function /// An invalid parameter was supplied to the function
InvalidParameter, InvalidParameter,
/// Packet failed one or more authentication (MAC) checks /// Packet failed one or more authentication (MAC) checks
@ -212,7 +212,7 @@ pub enum ReceiveResult<'a, H: Host> {
/// The session will have already been gated by the accept_new_session() method in the Host trait. /// The session will have already been gated by the accept_new_session() method in the Host trait.
OkNewSession(Session<H>), OkNewSession(Session<H>),
/// Packet apperas valid but was ignored e.g. as a duplicate. /// Packet appears valid but was ignored e.g. as a duplicate.
Ignored, Ignored,
} }

2
network-hypervisor/src/lib.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
pub const VERSION_MAJOR: u8 = 1; pub const VERSION_MAJOR: u8 = 1;
pub const VERSION_MINOR: u8 = 99; pub const VERSION_MINOR: u8 = 99;

2
network-hypervisor/src/protocol.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::convert::TryFrom; use std::convert::TryFrom;
use std::mem::MaybeUninit; use std::mem::MaybeUninit;

2
network-hypervisor/src/vl1/address.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::fmt::Debug; use std::fmt::Debug;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};

2
network-hypervisor/src/vl1/endpoint.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::cmp::Ordering; use std::cmp::Ordering;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};

2
network-hypervisor/src/vl1/event.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use crate::vl1::*; use crate::vl1::*;

2
network-hypervisor/src/vl1/identity.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::cmp::Ordering; use std::cmp::Ordering;
use std::convert::TryInto; use std::convert::TryInto;

2
network-hypervisor/src/vl1/inetaddress.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::cmp::Ordering; use std::cmp::Ordering;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};

2
network-hypervisor/src/vl1/mac.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::fmt::Debug; use std::fmt::Debug;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};

2
network-hypervisor/src/vl1/mod.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
mod address; mod address;
mod endpoint; mod endpoint;

4
network-hypervisor/src/vl1/node.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::HashMap; use std::collections::HashMap;
use std::convert::Infallible; use std::convert::Infallible;
@ -764,7 +764,7 @@ impl Node {
); );
// An 0xff value at byte [8] means this is a ZSSP packet. This is accomplished via the // An 0xff value at byte [8] means this is a ZSSP packet. This is accomplished via the
// backward compatibilty hack of always having 0xff at byte [4] of 6-byte session IDs // backward compatibility hack of always having 0xff at byte [4] of 6-byte session IDs
// and by having 0xffffffffffff be the "nil" session ID for session init packets. ZSSP // and by having 0xffffffffffff be the "nil" session ID for session init packets. ZSSP
// is the new V2 Noise-based forward-secure transport protocol. What follows below this // is the new V2 Noise-based forward-secure transport protocol. What follows below this
// is legacy handling of the old v1 protocol. // is legacy handling of the old v1 protocol.

2
network-hypervisor/src/vl1/path.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::HashMap; use std::collections::HashMap;
use std::hash::{BuildHasher, Hasher}; use std::hash::{BuildHasher, Hasher};

2
network-hypervisor/src/vl1/peer.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::HashMap; use std::collections::HashMap;
use std::convert::Infallible; use std::convert::Infallible;

2
network-hypervisor/src/vl1/rootset.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::BTreeSet; use std::collections::BTreeSet;
use std::io::Write; use std::io::Write;

2
network-hypervisor/src/vl2/mod.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
mod multicastgroup; mod multicastgroup;
mod networkid; mod networkid;

2
network-hypervisor/src/vl2/multicastgroup.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::fmt::Debug; use std::fmt::Debug;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};

2
network-hypervisor/src/vl2/networkconfig.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::io::Write; use std::io::Write;

2
network-hypervisor/src/vl2/networkid.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::fmt::Debug; use std::fmt::Debug;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};

2
network-hypervisor/src/vl2/switch.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::sync::Arc; use std::sync::Arc;

2
network-hypervisor/src/vl2/v1/certificateofmembership.rs
View file

@ -67,7 +67,7 @@ impl CertificateOfMembership {
q[8] = u64::MAX; // no to_be needed for all-1s q[8] = u64::MAX; // no to_be needed for all-1s
// This is a fix for a security issue in V1 in which an attacker could (with much CPU use) // This is a fix for a security issue in V1 in which an attacker could (with much CPU use)
// duplciate an identity and insert themselves in place of one after 30-60 days when local // duplicate an identity and insert themselves in place of one after 30-60 days when local
// identity caches expire. The full hash should have been included from the beginning, and // identity caches expire. The full hash should have been included from the beginning, and
// V2 only ever uses the full hash of the identity to verify credentials. // V2 only ever uses the full hash of the identity to verify credentials.
let fp = self.issued_to_fingerprint.as_bytes(); let fp = self.issued_to_fingerprint.as_bytes();

2
service/src/cli/mod.rs
View file

@ -1,3 +1,3 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
pub mod rootset; pub mod rootset;

2
service/src/cli/rootset.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::io::Write; use std::io::Write;

2
service/src/cmdline_help.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use zerotier_network_hypervisor::{VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION}; use zerotier_network_hypervisor::{VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION};

2
service/src/localconfig.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::BTreeMap; use std::collections::BTreeMap;

2
service/src/main.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
pub mod cli; pub mod cli;
pub mod cmdline_help; pub mod cmdline_help;

2
service/src/utils.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::path::Path; use std::path::Path;
use std::str::FromStr; use std::str::FromStr;

2
service/src/vnic/common.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use std::collections::HashSet; use std::collections::HashSet;
#[allow(unused_imports)] #[allow(unused_imports)]

2
service/src/vnic/mac_feth_tap.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
/* /*
* This creates a pair of feth devices with the lower numbered device * This creates a pair of feth devices with the lower numbered device

2
service/src/vnic/mod.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
pub mod vnic; pub mod vnic;

2
service/src/vnic/vnic.rs
View file

@ -1,4 +1,4 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md.
use zerotier_network_hypervisor::vl1::{InetAddress, MAC}; use zerotier_network_hypervisor::vl1::{InetAddress, MAC};
use zerotier_network_hypervisor::vl2::MulticastGroup; use zerotier_network_hypervisor::vl2::MulticastGroup;

2
third_party/kyber/examples/ake.rs vendored
View file

@ -15,7 +15,7 @@ fn main() -> Result<(), KyberError> {
// encapsulated shared secret back // encapsulated shared secret back
let server_send = bob.server_receive(client_send, &alice_keys.public, &bob_keys.secret, &mut rng)?; let server_send = bob.server_receive(client_send, &alice_keys.public, &bob_keys.secret, &mut rng)?;
// Alice autheticates and decapsulates // Alice authenticates and decapsulates
alice.client_confirm(server_send, &alice_keys.secret)?; alice.client_confirm(server_send, &alice_keys.secret)?;
// Both structs now have the shared secret // Both structs now have the shared secret