saymrwulf/curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/curve25519-dalek-source.git synced 2026-09-06 20:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement Zeroize for points as the identity element.

Browse source
This commit is contained in:
Isis Lovecruft 2021-03-25 01:45:54 +00:00
parent 5482c76d16
commit 4a1fc3c66e
No known key found for this signature in database
GPG key ID: AB41313533E8E812
3 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -48,7 +48,7 @@ serde = { version = "1.0", default-features = false, optional = true, features =
# The original packed_simd package was orphaned, see # The original packed_simd package was orphaned, see
# https://github.com/rust-lang/packed_simd/issues/303#issuecomment-701361161 # https://github.com/rust-lang/packed_simd/issues/303#issuecomment-701361161
packed_simd = { version = "0.3.4", package = "packed_simd_2", features = ["into_bits"], optional = true } packed_simd = { version = "0.3.4", package = "packed_simd_2", features = ["into_bits"], optional = true }
zeroize = { version = "1", default-features = false, features = ["zeroize_derive"] } zeroize = { version = "1", default-features = false }
[features] [features]
nightly = ["subtle/nightly"] nightly = ["subtle/nightly"]

26
src/edwards.rs
View file

@ -152,7 +152,7 @@ use backend::vector::scalar_mul;
/// ///
/// The first 255 bits of a `CompressedEdwardsY` represent the /// The first 255 bits of a `CompressedEdwardsY` represent the
/// \\(y\\)-coordinate. The high bit of the 32nd byte gives the sign of \\(x\\). /// \\(y\\)-coordinate. The high bit of the 32nd byte gives the sign of \\(x\\).
#[derive(Copy, Clone, Eq, PartialEq, Hash, Zeroize)] #[derive(Copy, Clone, Eq, PartialEq, Hash)]
pub struct CompressedEdwardsY(pub [u8; 32]); pub struct CompressedEdwardsY(pub [u8; 32]);
impl ConstantTimeEq for CompressedEdwardsY { impl ConstantTimeEq for CompressedEdwardsY {
@ -309,7 +309,7 @@ impl<'de> Deserialize<'de> for CompressedEdwardsY {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
/// An `EdwardsPoint` represents a point on the Edwards form of Curve25519. /// An `EdwardsPoint` represents a point on the Edwards form of Curve25519.
#[derive(Copy, Clone, Zeroize)] #[derive(Copy, Clone)]
#[allow(missing_docs)] #[allow(missing_docs)]
pub struct EdwardsPoint { pub struct EdwardsPoint {
pub(crate) X: FieldElement, pub(crate) X: FieldElement,
@ -369,6 +369,28 @@ impl Default for EdwardsPoint {
} }
} }
// ------------------------------------------------------------------------
// Zeroize implementations for wiping points from memory
// ------------------------------------------------------------------------
impl Zeroize for CompressedEdwardsY {
/// Reset this `CompressedEdwardsY` to the compressed form of the identity element.
fn zeroize(&mut self) {
self.0.zeroize();
self.0[0] = 1;
}
}
impl Zeroize for EdwardsPoint {
/// Reset this `CompressedEdwardsPoint` to the identity element.
fn zeroize(&mut self) {
self.X.zeroize();
self.Y = FieldElement::one();
self.Z = FieldElement::one();
self.T.zeroize();
}
}
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Validity checks (for debugging, not CT) // Validity checks (for debugging, not CT)
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

11
src/ristretto.rs
View file

@ -202,8 +202,6 @@ use backend::serial::scalar_mul;
))] ))]
use backend::vector::scalar_mul; use backend::vector::scalar_mul;
use zeroize::Zeroize;
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Compressed points // Compressed points
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -212,7 +210,7 @@ use zeroize::Zeroize;
/// ///
/// The Ristretto encoding is canonical, so two points are equal if and /// The Ristretto encoding is canonical, so two points are equal if and
/// only if their encodings are equal. /// only if their encodings are equal.
#[derive(Copy, Clone, Eq, PartialEq, Hash, Zeroize)] #[derive(Copy, Clone, Eq, PartialEq, Hash)]
pub struct CompressedRistretto(pub [u8; 32]); pub struct CompressedRistretto(pub [u8; 32]);
impl ConstantTimeEq for CompressedRistretto { impl ConstantTimeEq for CompressedRistretto {
@ -438,7 +436,7 @@ impl<'de> Deserialize<'de> for CompressedRistretto {
/// operations on `RistrettoPoint`s are exactly as fast as operations on /// operations on `RistrettoPoint`s are exactly as fast as operations on
/// `EdwardsPoint`s. /// `EdwardsPoint`s.
/// ///
#[derive(Copy, Clone, Zeroize)] #[derive(Copy, Clone)]
pub struct RistrettoPoint(pub(crate) EdwardsPoint); pub struct RistrettoPoint(pub(crate) EdwardsPoint);
impl RistrettoPoint { impl RistrettoPoint {
@ -1094,10 +1092,7 @@ impl Zeroize for CompressedRistretto {
impl Zeroize for RistrettoPoint { impl Zeroize for RistrettoPoint {
fn zeroize(&mut self) { fn zeroize(&mut self) {
self.0.X.zeroize(); self.0.zeroize();
self.0.Y.zeroize();
self.0.Z.zeroize();
self.0.T.zeroize();
} }
} }