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

Merge remote-tracking branch 'DebugSteven/zeroize' into feature/236-merge-rebase

Browse source
This commit is contained in:
Isis Lovecruft 2019-10-28 18:19:31 +00:00
commit 57f19e018f
No known key found for this signature in database
GPG key ID: AB41313533E8E812
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/montgomery.rs
View file

@ -17,7 +17,7 @@
//! Montgomery arithmetic works not on the curve itself, but on the //! Montgomery arithmetic works not on the curve itself, but on the
//! \\(u\\)-line, which discards sign information and unifies the curve //! \\(u\\)-line, which discards sign information and unifies the curve
//! and its quadratic twist. See [_Montgomery curves and their //! and its quadratic twist. See [_Montgomery curves and their
//! arithmetic_][costello-smith] by Costello and Smith for more details. //! arithmetic_][costello-smith] by Costello and Smith for more details.
//! //!
//! The `MontgomeryPoint` struct contains the affine \\(u\\)-coordinate //! The `MontgomeryPoint` struct contains the affine \\(u\\)-coordinate
//! \\(u\_0(P)\\) of a point \\(P\\) on either the curve or the twist. //! \\(u\_0(P)\\) of a point \\(P\\) on either the curve or the twist.
@ -61,6 +61,8 @@ use subtle::Choice;
use subtle::ConditionallySelectable; use subtle::ConditionallySelectable;
use subtle::ConstantTimeEq; use subtle::ConstantTimeEq;
use zeroize::Zeroize;
/// Holds the \\(u\\)-coordinate of a point on the Montgomery form of /// Holds the \\(u\\)-coordinate of a point on the Montgomery form of
/// Curve25519 or its twist. /// Curve25519 or its twist.
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
@ -91,6 +93,12 @@ impl PartialEq for MontgomeryPoint {
impl Eq for MontgomeryPoint {} impl Eq for MontgomeryPoint {}
impl Zeroize for MontgomeryPoint {
fn zeroize(&mut self) {
self.0.zeroize();
}
}
impl MontgomeryPoint { impl MontgomeryPoint {
/// View this `MontgomeryPoint` as an array of bytes. /// View this `MontgomeryPoint` as an array of bytes.
pub fn as_bytes<'a>(&'a self) -> &'a [u8; 32] { pub fn as_bytes<'a>(&'a self) -> &'a [u8; 32] {
@ -357,7 +365,7 @@ mod test {
#[test] #[test]
fn montgomery_to_edwards_rejects_twist() { fn montgomery_to_edwards_rejects_twist() {
let one = FieldElement::one(); let one = FieldElement::one();
// u = 2 corresponds to a point on the twist. // u = 2 corresponds to a point on the twist.
let two = MontgomeryPoint((&one+&one).to_bytes()); let two = MontgomeryPoint((&one+&one).to_bytes());

8
src/scalar.rs
View file

@ -160,6 +160,8 @@ use subtle::Choice;
use subtle::ConditionallySelectable; use subtle::ConditionallySelectable;
use subtle::ConstantTimeEq; use subtle::ConstantTimeEq;
use zeroize::Zeroize;
use backend; use backend;
use constants; use constants;
@ -522,6 +524,12 @@ impl From<u128> for Scalar {
} }
} }
impl Zeroize for Scalar {
fn zeroize(&mut self) {
self.bytes.zeroize();
}
}
impl Scalar { impl Scalar {
/// Return a `Scalar` chosen uniformly at random using a user-provided RNG. /// Return a `Scalar` chosen uniformly at random using a user-provided RNG.
/// ///