From 9c23c3699653fea0e191a3babe8c00fe285d8f59 Mon Sep 17 00:00:00 2001
From: Guillaume Endignoux <guillaumee@google.com>
Date: Thu, 6 Feb 2020 16:43:32 +0100
Subject: [PATCH] Update the ring dev dependency version.
---
libraries/crypto/Cargo.toml | 4 ++--
libraries/crypto/src/ecdsa.rs | 43 +++++++++++++++++------------------
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/libraries/crypto/Cargo.toml b/libraries/crypto/Cargo.toml
index 57c8cb8..40a2f2f 100644
--- a/libraries/crypto/Cargo.toml
+++ b/libraries/crypto/Cargo.toml
@@ -16,8 +16,8 @@ arrayref = "0.3.6"
subtle = { version = "2.2", default-features = false, features = ["nightly"] }
byteorder = { version = "1", default-features = false }
hex = { version = "0.3.2", default-features = false, optional = true }
-ring = { version = "0.14.6", optional = true }
-untrusted = { version = "0.6.2", optional = true }
+ring = { version = "0.16.11", optional = true }
+untrusted = { version = "0.7.0", optional = true }
rand = { version = "0.6.5", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] }
serde_json = { version = "1.0", optional = true }
diff --git a/libraries/crypto/src/ecdsa.rs b/libraries/crypto/src/ecdsa.rs
index 9fe0580..966552d 100644
--- a/libraries/crypto/src/ecdsa.rs
+++ b/libraries/crypto/src/ecdsa.rs
@@ -495,14 +495,13 @@ mod test {
#[test]
fn test_ring_sign_ring_verify() {
use ring::rand::SecureRandom;
- use ring::signature::KeyPair;
+ use ring::signature::{KeyPair, VerificationAlgorithm};
let ring_rng = ring::rand::SystemRandom::new();
for _ in 0..ITERATIONS {
let mut msg_bytes: [u8; 64] = [Default::default(); 64];
ring_rng.fill(&mut msg_bytes).unwrap();
- let msg = untrusted::Input::from(&msg_bytes);
let pkcs8_bytes = ring::signature::EcdsaKeyPair::generate_pkcs8(
&ring::signature::ECDSA_P256_SHA256_FIXED_SIGNING,
@@ -511,21 +510,21 @@ mod test {
.unwrap();
let key_pair = ring::signature::EcdsaKeyPair::from_pkcs8(
&ring::signature::ECDSA_P256_SHA256_FIXED_SIGNING,
- untrusted::Input::from(pkcs8_bytes.as_ref()),
+ pkcs8_bytes.as_ref(),
)
.unwrap();
let public_key_bytes = key_pair.public_key().as_ref();
- let sig = key_pair.sign(&ring_rng, msg).unwrap();
+ let sig = key_pair.sign(&ring_rng, &msg_bytes).unwrap();
let sig_bytes = sig.as_ref();
- assert!(ring::signature::verify(
- &ring::signature::ECDSA_P256_SHA256_FIXED,
- untrusted::Input::from(public_key_bytes),
- msg,
- untrusted::Input::from(sig_bytes)
- )
- .is_ok());
+ assert!(ring::signature::ECDSA_P256_SHA256_FIXED
+ .verify(
+ untrusted::Input::from(public_key_bytes),
+ untrusted::Input::from(&msg_bytes),
+ untrusted::Input::from(sig_bytes)
+ )
+ .is_ok());
}
}
@@ -548,14 +547,12 @@ mod test {
.unwrap();
let key_pair = ring::signature::EcdsaKeyPair::from_pkcs8(
&ring::signature::ECDSA_P256_SHA256_FIXED_SIGNING,
- untrusted::Input::from(pkcs8_bytes.as_ref()),
+ pkcs8_bytes.as_ref(),
)
.unwrap();
let public_key_bytes = key_pair.public_key().as_ref();
- let sig = key_pair
- .sign(&ring_rng, untrusted::Input::from(&msg_bytes))
- .unwrap();
+ let sig = key_pair.sign(&ring_rng, &msg_bytes).unwrap();
let sig_bytes = sig.as_ref();
let pk = PubKey::from_bytes_uncompressed(public_key_bytes).unwrap();
@@ -567,6 +564,8 @@ mod test {
// Test that messages signed by this code are correctly verified by the ring crate.
#[test]
fn test_self_sign_ring_verify() {
+ use ring::signature::VerificationAlgorithm;
+
let mut rng = ThreadRng256 {};
for _ in 0..ITERATIONS {
@@ -580,13 +579,13 @@ mod test {
let mut sig_bytes: [u8; 64] = [Default::default(); 64];
sign.to_bytes(&mut sig_bytes);
- assert!(ring::signature::verify(
- &ring::signature::ECDSA_P256_SHA256_FIXED,
- untrusted::Input::from(&public_key_bytes),
- untrusted::Input::from(&msg_bytes),
- untrusted::Input::from(&sig_bytes)
- )
- .is_ok());
+ assert!(ring::signature::ECDSA_P256_SHA256_FIXED
+ .verify(
+ untrusted::Input::from(&public_key_bytes),
+ untrusted::Input::from(&msg_bytes),
+ untrusted::Input::from(&sig_bytes)
+ )
+ .is_ok());
}
}
--
GitLab