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

Bump versions for several dependencies.

Browse source
This commit is contained in:
Isis Lovecruft 2018-01-20 02:36:42 +00:00
parent e356e476d8
commit 04c8574106
Failed to extract signature
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Cargo.toml
View file

@ -16,30 +16,30 @@ exclude = [ ".gitignore", "TESTVECTORS", "res/*" ]
travis-ci = { repository = "isislovecruft/ed25519-dalek", branch = "master"} travis-ci = { repository = "isislovecruft/ed25519-dalek", branch = "master"}
[dependencies.curve25519-dalek] [dependencies.curve25519-dalek]
version = "^0.14" version = "0.14"
default-features = false default-features = false
[dependencies.subtle] [dependencies.subtle]
version = "^0.3" version = "0.5"
default-features = false default-features = false
[dependencies.rand] [dependencies.rand]
optional = true optional = true
version = "^0.3" version = "0.4"
[dependencies.digest] [dependencies.digest]
version = "^0.6" version = "0.6"
[dependencies.generic-array] [dependencies.generic-array]
# same version that digest depends on # same version that digest depends on
version = "^0.8" version = "0.9"
[dependencies.serde] [dependencies.serde]
version = "^1.0" version = "^1.0"
optional = true optional = true
[dependencies.sha2] [dependencies.sha2]
version = "^0.6" version = "0.7"
optional = true optional = true
[dependencies.failure] [dependencies.failure]

10
src/ed25519.rs
View file

@ -27,10 +27,7 @@ use serde::de::Visitor;
#[cfg(feature = "sha2")] #[cfg(feature = "sha2")]
use sha2::Sha512; use sha2::Sha512;
use digest::BlockInput;
use digest::Digest; use digest::Digest;
use digest::Input;
use digest::FixedOutput;
use generic_array::typenum::U64; use generic_array::typenum::U64;
@ -539,7 +536,6 @@ impl ExpandedSecretKey {
/// ``` /// ```
pub fn from_secret_key<D>(secret_key: &SecretKey) -> ExpandedSecretKey pub fn from_secret_key<D>(secret_key: &SecretKey) -> ExpandedSecretKey
where D: Digest<OutputSize = U64> + Default { where D: Digest<OutputSize = U64> + Default {
let mut h: D = D::default(); let mut h: D = D::default();
let mut hash: [u8; 64] = [0u8; 64]; let mut hash: [u8; 64] = [0u8; 64];
let mut lower: [u8; 32] = [0u8; 32]; let mut lower: [u8; 32] = [0u8; 32];
@ -561,7 +557,6 @@ impl ExpandedSecretKey {
/// Sign a message with this `ExpandedSecretKey`. /// Sign a message with this `ExpandedSecretKey`.
pub fn sign<D>(&self, message: &[u8], public_key: &PublicKey) -> Signature pub fn sign<D>(&self, message: &[u8], public_key: &PublicKey) -> Signature
where D: Digest<OutputSize = U64> + Default { where D: Digest<OutputSize = U64> + Default {
let mut h: D = D::default(); let mut h: D = D::default();
let mut hash: [u8; 64] = [0u8; 64]; let mut hash: [u8; 64] = [0u8; 64];
let mesg_digest: Scalar; let mesg_digest: Scalar;
@ -887,13 +882,14 @@ impl Keypair {
} }
/// Sign a message with this keypair's secret key. /// Sign a message with this keypair's secret key.
pub fn sign<D>(&self, message: &[u8]) -> Signature where D: Digest<OutputSize = U64> + Default { pub fn sign<D>(&self, message: &[u8]) -> Signature
where D: Digest<OutputSize = U64> + Default {
self.secret.expand::<D>().sign::<D>(&message, &self.public) self.secret.expand::<D>().sign::<D>(&message, &self.public)
} }
/// Verify a signature on a message with this keypair's public key. /// Verify a signature on a message with this keypair's public key.
pub fn verify<D>(&self, message: &[u8], signature: &Signature) -> bool pub fn verify<D>(&self, message: &[u8], signature: &Signature) -> bool
where D: FixedOutput<OutputSize = U64> + BlockInput + Default + Input { where D: Digest<OutputSize = U64> + Default {
self.public.verify::<D>(message, signature) self.public.verify::<D>(message, signature)
} }
} }