kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23 from gendx/update-ring

Browse Source 
Update the ring dev dependency version.
This commit is contained in:
gendx
2020-02-07 15:05:53 +01:00
committed by GitHub
parent d8c29b7ef1 edfa0268ca
commit 06f6ea9466
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/crypto/Cargo.toml
View File

@@ -16,8 +16,8 @@ arrayref = "0.3.6"
subtle = { version = "2.2", default-features = false, features = ["nightly"] } subtle = { version = "2.2", default-features = false, features = ["nightly"] }
byteorder = { version = "1", default-features = false } byteorder = { version = "1", default-features = false }
hex = { version = "0.3.2", default-features = false, optional = true } hex = { version = "0.3.2", default-features = false, optional = true }
ring = { version = "0.14.6", optional = true } ring = { version = "0.16.11", optional = true }
untrusted = { version = "0.6.2", optional = true } untrusted = { version = "0.7.0", optional = true }
rand = { version = "0.6.5", optional = true } rand = { version = "0.6.5", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] } serde = { version = "1.0", optional = true, features = ["derive"] }
serde_json = { version = "1.0", optional = true } serde_json = { version = "1.0", optional = true }

43
libraries/crypto/src/ecdsa.rs
View File

@@ -495,14 +495,13 @@ mod test {
#[test] #[test]
fn test_ring_sign_ring_verify() { fn test_ring_sign_ring_verify() {
use ring::rand::SecureRandom; use ring::rand::SecureRandom;
use ring::signature::KeyPair; use ring::signature::{KeyPair, VerificationAlgorithm};
let ring_rng = ring::rand::SystemRandom::new(); let ring_rng = ring::rand::SystemRandom::new();
for _ in 0..ITERATIONS { for _ in 0..ITERATIONS {
let mut msg_bytes: [u8; 64] = [Default::default(); 64]; let mut msg_bytes: [u8; 64] = [Default::default(); 64];
ring_rng.fill(&mut msg_bytes).unwrap(); ring_rng.fill(&mut msg_bytes).unwrap();
let msg = untrusted::Input::from(&msg_bytes);
let pkcs8_bytes = ring::signature::EcdsaKeyPair::generate_pkcs8( let pkcs8_bytes = ring::signature::EcdsaKeyPair::generate_pkcs8(
&ring::signature::ECDSA_P256_SHA256_FIXED_SIGNING, &ring::signature::ECDSA_P256_SHA256_FIXED_SIGNING,
@@ -511,21 +510,21 @@ mod test {
.unwrap(); .unwrap();
let key_pair = ring::signature::EcdsaKeyPair::from_pkcs8( let key_pair = ring::signature::EcdsaKeyPair::from_pkcs8(
&ring::signature::ECDSA_P256_SHA256_FIXED_SIGNING, &ring::signature::ECDSA_P256_SHA256_FIXED_SIGNING,
untrusted::Input::from(pkcs8_bytes.as_ref()), pkcs8_bytes.as_ref(),
) )
.unwrap(); .unwrap();
let public_key_bytes = key_pair.public_key().as_ref(); 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(); let sig_bytes = sig.as_ref();
assert!(ring::signature::verify( assert!(ring::signature::ECDSA_P256_SHA256_FIXED
&ring::signature::ECDSA_P256_SHA256_FIXED, .verify(
untrusted::Input::from(public_key_bytes), untrusted::Input::from(public_key_bytes),
msg, untrusted::Input::from(&msg_bytes),
untrusted::Input::from(sig_bytes) untrusted::Input::from(sig_bytes)
) )
.is_ok()); .is_ok());
} }
} }
@@ -548,14 +547,12 @@ mod test {
.unwrap(); .unwrap();
let key_pair = ring::signature::EcdsaKeyPair::from_pkcs8( let key_pair = ring::signature::EcdsaKeyPair::from_pkcs8(
&ring::signature::ECDSA_P256_SHA256_FIXED_SIGNING, &ring::signature::ECDSA_P256_SHA256_FIXED_SIGNING,
untrusted::Input::from(pkcs8_bytes.as_ref()), pkcs8_bytes.as_ref(),
) )
.unwrap(); .unwrap();
let public_key_bytes = key_pair.public_key().as_ref(); let public_key_bytes = key_pair.public_key().as_ref();
let sig = key_pair let sig = key_pair.sign(&ring_rng, &msg_bytes).unwrap();
.sign(&ring_rng, untrusted::Input::from(&msg_bytes))
.unwrap();
let sig_bytes = sig.as_ref(); let sig_bytes = sig.as_ref();
let pk = PubKey::from_bytes_uncompressed(public_key_bytes).unwrap(); 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 that messages signed by this code are correctly verified by the ring crate.
#[test] #[test]
fn test_self_sign_ring_verify() { fn test_self_sign_ring_verify() {
use ring::signature::VerificationAlgorithm;
let mut rng = ThreadRng256 {}; let mut rng = ThreadRng256 {};
for _ in 0..ITERATIONS { for _ in 0..ITERATIONS {
@@ -580,13 +579,13 @@ mod test {
let mut sig_bytes: [u8; 64] = [Default::default(); 64]; let mut sig_bytes: [u8; 64] = [Default::default(); 64];
sign.to_bytes(&mut sig_bytes); sign.to_bytes(&mut sig_bytes);
assert!(ring::signature::verify( assert!(ring::signature::ECDSA_P256_SHA256_FIXED
&ring::signature::ECDSA_P256_SHA256_FIXED, .verify(
untrusted::Input::from(&public_key_bytes), untrusted::Input::from(&public_key_bytes),
untrusted::Input::from(&msg_bytes), untrusted::Input::from(&msg_bytes),
untrusted::Input::from(&sig_bytes) untrusted::Input::from(&sig_bytes)
) )
.is_ok()); .is_ok());
} }
} }