From 6d232f817cbcfff1b4e61f4ad6762ee6b21ba646 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Thu, 28 Apr 2022 14:03:48 -0400
Subject: [PATCH] Some renaming to be logical.

---
 zerotier-core-crypto/src/lib.rs                   | 2 +-
 zerotier-core-crypto/src/{c25519.rs => x25519.rs} | 0
 zerotier-network-hypervisor/src/vl1/hybridkey.rs  | 2 +-
 zerotier-network-hypervisor/src/vl1/identity.rs   | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename zerotier-core-crypto/src/{c25519.rs => x25519.rs} (100%)

diff --git a/zerotier-core-crypto/src/lib.rs b/zerotier-core-crypto/src/lib.rs
index 11d827702..a2427ff94 100644
--- a/zerotier-core-crypto/src/lib.rs
+++ b/zerotier-core-crypto/src/lib.rs
@@ -6,7 +6,6 @@
  * https://www.zerotier.com/
  */
 
-pub mod c25519;
 pub mod hash;
 pub mod hex;
 pub mod kbkdf;
@@ -16,6 +15,7 @@ pub mod random;
 pub mod salsa;
 pub mod secret;
 pub mod varint;
+pub mod x25519;
 
 pub use aes_gmac_siv;
 pub use rand_core;
diff --git a/zerotier-core-crypto/src/c25519.rs b/zerotier-core-crypto/src/x25519.rs
similarity index 100%
rename from zerotier-core-crypto/src/c25519.rs
rename to zerotier-core-crypto/src/x25519.rs
diff --git a/zerotier-network-hypervisor/src/vl1/hybridkey.rs b/zerotier-network-hypervisor/src/vl1/hybridkey.rs
index 06fbf1d30..8309edfcf 100644
--- a/zerotier-network-hypervisor/src/vl1/hybridkey.rs
+++ b/zerotier-network-hypervisor/src/vl1/hybridkey.rs
@@ -8,10 +8,10 @@
 
 use std::io::Write;
 
-use zerotier_core_crypto::c25519::{C25519KeyPair, C25519_PUBLIC_KEY_SIZE};
 use zerotier_core_crypto::hash::{hmac_sha512, SHA512};
 use zerotier_core_crypto::p384::{P384KeyPair, P384PublicKey, P384_PUBLIC_KEY_SIZE};
 use zerotier_core_crypto::secret::Secret;
+use zerotier_core_crypto::x25519::{C25519KeyPair, C25519_PUBLIC_KEY_SIZE};
 
 pub const ALGORITHM_C25519: u8 = 0x01;
 pub const ALGORITHM_ECC_NIST_P384: u8 = 0x02;
diff --git a/zerotier-network-hypervisor/src/vl1/identity.rs b/zerotier-network-hypervisor/src/vl1/identity.rs
index a9abce0b6..11f189be0 100644
--- a/zerotier-network-hypervisor/src/vl1/identity.rs
+++ b/zerotier-network-hypervisor/src/vl1/identity.rs
@@ -19,12 +19,12 @@ use lazy_static::lazy_static;
 
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-use zerotier_core_crypto::c25519::*;
 use zerotier_core_crypto::hash::*;
 use zerotier_core_crypto::hex;
 use zerotier_core_crypto::p384::*;
 use zerotier_core_crypto::salsa::Salsa;
 use zerotier_core_crypto::secret::Secret;
+use zerotier_core_crypto::x25519::*;
 
 use crate::error::{InvalidFormatError, InvalidParameterError};
 use crate::util::buffer::Buffer;