github/ed25519-dalek
1
1
Fork 0
mirror of https://github.com/dalek-cryptography/ed25519-dalek.git synced 2026-01-09 19:18:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove conversion to/from X25519 keys.

Browse Source
This commit is contained in:
Isis Lovecruft
2016-12-08 10:19:34 +00:00
parent 1dc3865bf0
commit d9ec8386da
1 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ed25519.rs
View File

@@ -22,7 +22,6 @@ use curve25519_dalek::curve::CompressedPoint;
use curve25519_dalek::curve::ExtendedPoint;
use curve25519_dalek::curve::ProjectivePoint;
use curve25519_dalek::field::FieldElement;
use curve25519_dalek::curve25519::{Curve25519Public, Curve25519Secret};
use curve25519_dalek::scalar::Scalar;
use curve25519_dalek::util::arrays_equal_ct;
@@ -65,27 +64,6 @@ impl SecretKey {
self.0
}
/// Convert an ed25519 private key into a corresponding curve25519 private key.
///
/// # Return
///
/// A curve25519 public key, as would result from `PublicKey.to_curve25519()`.
pub fn to_curve25519(&self) -> Curve25519Secret { // PrivateKeyToCurve25519
let mut h: Sha512 = Sha512::new();
let mut hash: [u8; 64] = [0u8; 64];
h.input(&self.to_bytes());
h.result(&mut hash);
let digest: &mut [u8; 32] = array_mut_ref!(hash, 0, 32);
digest[0] &= 248;
digest[31] &= 127;
digest[31] |= 64;
Curve25519Secret(*digest)
}
/// Sign a message with this keypair's secret key.
pub fn sign(&self, message: &[u8]) -> Signature {
let mut h: Sha512 = Sha512::new();
@@ -157,21 +135,6 @@ impl PublicKey {
self.0.decompress()
}
/// Convert this ed25519 public key to a curve25519 public key.
pub fn to_curve25519(&self) -> Option<Curve25519Public> { // PublicKeyToCurve25519
let a: ExtendedPoint;
let x: FieldElement;
match self.decompress() {
Some(element) => a = element,
None => return None,
}
// a.Z == 1 as a postcondition of from_bytes()
x = a.edwards_to_montgomery_x();
Some(Curve25519Public(x.to_bytes()))
}
/// Verify a signature on a message with this keypair's public key.
///
/// # Return