logos-messaging/libchat
1
0
Fork 0
mirror of https://github.com/logos-messaging/libchat.git synced 2026-03-26 22:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alias x25519_dalek::PublicKey to DrPublicKey

Browse Source
This commit is contained in:
Jazz Turner-Baggs 2026-02-12 16:47:35 -08:00
parent c9d84a482c
commit 69541ea5fb
No known key found for this signature in database
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crypto/src/keys.rs
View File

@ -2,32 +2,33 @@ pub use generic_array::{GenericArray, typenum::U32};
use rand_core::{CryptoRng, OsRng, RngCore}; use rand_core::{CryptoRng, OsRng, RngCore};
use std::{fmt::Debug, ops::Deref}; use std::{fmt::Debug, ops::Deref};
use x25519_dalek::{PublicKey as DrPublicKey, SharedSecret, StaticSecret as DrPrivateKey};
use xeddsa::xed25519::{PrivateKey as EdPrivateKey, PublicKey as EdPublicKey}; use xeddsa::xed25519::{PrivateKey as EdPrivateKey, PublicKey as EdPublicKey};
use zeroize::{Zeroize, ZeroizeOnDrop}; use zeroize::{Zeroize, ZeroizeOnDrop};
#[derive(Debug, Copy, Clone, PartialEq, Hash, Eq, Zeroize)] // TODO: (!) Zeroize only required by InstallationKeyPair #[derive(Debug, Copy, Clone, PartialEq, Hash, Eq, Zeroize)] // TODO: (!) Zeroize only required by InstallationKeyPair
pub struct PublicKey(x25519_dalek::PublicKey); pub struct PublicKey(DrPublicKey);
impl From<x25519_dalek::PublicKey> for PublicKey { impl From<DrPublicKey> for PublicKey {
fn from(value: x25519_dalek::PublicKey) -> Self { fn from(value: DrPublicKey) -> Self {
Self(value) Self(value)
} }
} }
impl From<&PrivateKey> for PublicKey { impl From<&PrivateKey> for PublicKey {
fn from(value: &PrivateKey) -> Self { fn from(value: &PrivateKey) -> Self {
Self(x25519_dalek::PublicKey::from(&value.0)) Self(DrPublicKey::from(&value.0))
} }
} }
impl From<[u8; 32]> for PublicKey { impl From<[u8; 32]> for PublicKey {
fn from(value: [u8; 32]) -> Self { fn from(value: [u8; 32]) -> Self {
Self(x25519_dalek::PublicKey::from(value)) Self(DrPublicKey::from(value))
} }
} }
impl Deref for PublicKey { impl Deref for PublicKey {
type Target = x25519_dalek::PublicKey; type Target = DrPublicKey;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.0 &self.0
} }
@ -46,11 +47,11 @@ impl From<&PublicKey> for EdPublicKey {
} }
#[derive(Clone, Zeroize, ZeroizeOnDrop)] #[derive(Clone, Zeroize, ZeroizeOnDrop)]
pub struct PrivateKey(x25519_dalek::StaticSecret); pub struct PrivateKey(DrPrivateKey);
impl PrivateKey { impl PrivateKey {
pub fn random_from_rng<T: RngCore + CryptoRng>(csprng: T) -> Self { pub fn random_from_rng<T: RngCore + CryptoRng>(csprng: T) -> Self {
Self(x25519_dalek::StaticSecret::random_from_rng(csprng)) Self(DrPrivateKey::random_from_rng(csprng))
} }
//TODO: Remove. Force internal callers provide Rng to make deterministic testing possible //TODO: Remove. Force internal callers provide Rng to make deterministic testing possible
@ -61,12 +62,12 @@ impl PrivateKey {
impl From<[u8; 32]> for PrivateKey { impl From<[u8; 32]> for PrivateKey {
fn from(value: [u8; 32]) -> Self { fn from(value: [u8; 32]) -> Self {
Self(x25519_dalek::StaticSecret::from(value)) Self(DrPrivateKey::from(value))
} }
} }
impl Deref for PrivateKey { impl Deref for PrivateKey {
type Target = x25519_dalek::StaticSecret; type Target = DrPrivateKey;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.0 &self.0
} }
@ -118,10 +119,10 @@ impl From<GenericArray<u8, U32>> for SymmetricKey32 {
} }
} }
impl From<&x25519_dalek::SharedSecret> for SymmetricKey32 { impl From<&SharedSecret> for SymmetricKey32 {
// This relies on the feature 'zeroize' being set for x25519-dalek. // This relies on the feature 'zeroize' being set for x25519-dalek.
// If not the SharedSecret will need to manually zeroized // If not the SharedSecret will need to manually zeroized
fn from(value: &x25519_dalek::SharedSecret) -> Self { fn from(value: &SharedSecret) -> Self {
value.to_bytes().into() value.to_bytes().into()
} }
} }