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

Rename DecafPoint -> CompressedDecaf

Browse source
This commit is contained in:
Henry de Valence 2017-02-19 23:10:44 -08:00
parent eec7747be7
commit 08fc10f356
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/decaf.rs
View file

@ -34,10 +34,10 @@ use curve::ExtendedPoint;
/// ///
/// XXX think about how this API should work /// XXX think about how this API should work
#[derive(Copy, Clone, Eq, PartialEq)] #[derive(Copy, Clone, Eq, PartialEq)]
pub struct DecafPoint(pub [u8; 32]); pub struct CompressedDecaf(pub [u8; 32]);
impl DecafPoint { impl CompressedDecaf {
/// View this `DecafPoint` as an array of bytes. /// View this `CompressedDecaf` as an array of bytes.
pub fn to_bytes(&self) -> [u8;32] { pub fn to_bytes(&self) -> [u8;32] {
self.0 self.0
} }
@ -74,7 +74,7 @@ impl DecafPoint {
impl ExtendedPoint { impl ExtendedPoint {
/// Compress in Decaf format. /// Compress in Decaf format.
pub fn compress_decaf(&self) -> DecafPoint { pub fn compress_decaf(&self) -> CompressedDecaf {
// Q: Do we want to encode twisted or untwisted? // Q: Do we want to encode twisted or untwisted?
// //
// Notes: // Notes:
@ -139,7 +139,7 @@ impl ExtendedPoint {
let dYT = &constants::d * &(&Y * &XY); let dYT = &constants::d * &(&Y * &XY);
let mut s = &u * &(&(&r * &(&minus_ZX - &dYT)) + &Y); let mut s = &u * &(&(&r * &(&minus_ZX - &dYT)) + &Y);
s.negate(); s.negate();
DecafPoint(s.abs_decaf().to_bytes()) CompressedDecaf(s.abs_decaf().to_bytes())
} }
} }
@ -148,9 +148,9 @@ impl ExtendedPoint {
// Debug traits // Debug traits
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
impl Debug for DecafPoint { impl Debug for CompressedDecaf {
fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
write!(f, "DecafPoint: {:?}", &self.0[..]) write!(f, "CompressedDecaf: {:?}", &self.0[..])
} }
} }
@ -173,7 +173,7 @@ mod test {
#[test] #[test]
fn test_decaf_decompress_id() { fn test_decaf_decompress_id() {
let compressed_id = DecafPoint([0u8; 32]); let compressed_id = CompressedDecaf([0u8; 32]);
let id = compressed_id.decompress().unwrap(); let id = compressed_id.decompress().unwrap();
// This should compress (as ed25519) to the following: // This should compress (as ed25519) to the following:
let mut bytes = [0u8; 32]; bytes[0] = 1; let mut bytes = [0u8; 32]; bytes[0] = 1;
@ -183,7 +183,7 @@ mod test {
#[test] #[test]
fn test_decaf_compress_id() { fn test_decaf_compress_id() {
let id = ExtendedPoint::identity(); let id = ExtendedPoint::identity();
assert_eq!(id.compress_decaf(), DecafPoint([0u8; 32])); assert_eq!(id.compress_decaf(), CompressedDecaf([0u8; 32]));
} }
#[test] #[test]