chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from briansmith/update-ring

Browse Source 
Update to *ring* 0.9.4.
This commit is contained in:
Jimmy Cuadra 2017-05-09 03:12:51 -07:00 committed by GitHub
commit 7d34d869c6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -8,15 +8,15 @@ license = "MIT"
name = "ruma-signatures" name = "ruma-signatures"
readme = "README.md" readme = "README.md"
repository = "https://github.com/ruma/ruma-signatures" repository = "https://github.com/ruma/ruma-signatures"
version = "0.3.0" version = "0.4.0"
[dependencies] [dependencies]
base64 = "0.5.0" base64 = "0.5.0"
lazy_static = "0.2.8" lazy_static = "0.2.8"
ring = "0.7" ring = "0.9.4"
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
untrusted = "0.3" untrusted = "0.5"
url = "1.4" url = "1.4"
[dev-dependencies] [dev-dependencies]

8
src/lib.rs
View File

@ -342,9 +342,9 @@ pub trait Verifier {
impl KeyPair for Ed25519KeyPair { impl KeyPair for Ed25519KeyPair {
fn new(public_key: &[u8], private_key: &[u8], version: String) -> Result<Self, Error> { fn new(public_key: &[u8], private_key: &[u8], version: String) -> Result<Self, Error> {
Ok(Ed25519KeyPair { Ok(Ed25519KeyPair {
ring_key_pair: RingEd25519KeyPair::from_bytes( ring_key_pair: RingEd25519KeyPair::from_seed_and_public_key(
private_key, untrusted::Input::from(private_key),
public_key, untrusted::Input::from(public_key),
).map_err(|_| Error::new("invalid key pair"))?, ).map_err(|_| Error::new("invalid key pair"))?,
version: version, version: version,
}) })
@ -353,7 +353,7 @@ impl KeyPair for Ed25519KeyPair {
fn sign(&self, message: &[u8]) -> Signature { fn sign(&self, message: &[u8]) -> Signature {
Signature { Signature {
algorithm: Algorithm::Ed25519, algorithm: Algorithm::Ed25519,
signature: self.ring_key_pair.sign(message).as_slice().to_vec(), signature: self.ring_key_pair.sign(message).as_ref().to_vec(),
version: self.version.clone(), version: self.version.clone(),
} }
} }