mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
fix engine tests
engine wasn't passing because the *tests* were incorrect, due to incorrect upgrades on the API. The tests are now to spec.
This commit is contained in:
parent
e48832a139
commit
1079157be9
1 changed files with 12 additions and 27 deletions
|
|
@ -180,9 +180,9 @@ pub fn benchmark_thread(sid0: usize, sid1: usize, sid2: usize, sid3: usize) {
|
||||||
let mut fails = 0;
|
let mut fails = 0;
|
||||||
|
|
||||||
use x25519_dalek::{PublicKey, StaticSecret};
|
use x25519_dalek::{PublicKey, StaticSecret};
|
||||||
let alice_secret = StaticSecret::new(&mut trng);
|
let alice_secret = StaticSecret::random_from_rng(&mut trng);
|
||||||
let alice_public = PublicKey::from(&alice_secret);
|
let alice_public = PublicKey::from(&alice_secret);
|
||||||
let bob_secret = StaticSecret::new(&mut trng);
|
let bob_secret = StaticSecret::random_from_rng(&mut trng);
|
||||||
let bob_public = PublicKey::from(&bob_secret);
|
let bob_public = PublicKey::from(&bob_secret);
|
||||||
for _ in 0..TEST_ITERS_DH {
|
for _ in 0..TEST_ITERS_DH {
|
||||||
let alice_shared_secret = alice_secret.diffie_hellman(&bob_public);
|
let alice_shared_secret = alice_secret.diffie_hellman(&bob_public);
|
||||||
|
|
@ -365,9 +365,9 @@ impl<'a> ShellCmdApi<'a> for Engine {
|
||||||
}
|
}
|
||||||
"dh" => {
|
"dh" => {
|
||||||
use x25519_dalek::{EphemeralSecret, PublicKey};
|
use x25519_dalek::{EphemeralSecret, PublicKey};
|
||||||
let alice_secret = EphemeralSecret::new(&mut env.trng);
|
let alice_secret = EphemeralSecret::random_from_rng(&mut env.trng);
|
||||||
let alice_public = PublicKey::from(&alice_secret);
|
let alice_public = PublicKey::from(&alice_secret);
|
||||||
let bob_secret = EphemeralSecret::new(&mut env.trng);
|
let bob_secret = EphemeralSecret::random_from_rng(&mut env.trng);
|
||||||
let bob_public = PublicKey::from(&bob_secret);
|
let bob_public = PublicKey::from(&bob_secret);
|
||||||
let alice_shared_secret = alice_secret.diffie_hellman(&bob_public);
|
let alice_shared_secret = alice_secret.diffie_hellman(&bob_public);
|
||||||
let bob_shared_secret = bob_secret.diffie_hellman(&alice_public);
|
let bob_shared_secret = bob_secret.diffie_hellman(&alice_public);
|
||||||
|
|
@ -389,29 +389,12 @@ impl<'a> ShellCmdApi<'a> for Engine {
|
||||||
|
|
||||||
/////////////////////// fixed vectors from x25519-dalek tests
|
/////////////////////// fixed vectors from x25519-dalek tests
|
||||||
use curve25519_dalek::montgomery::MontgomeryPoint;
|
use curve25519_dalek::montgomery::MontgomeryPoint;
|
||||||
use curve25519_dalek::scalar::Scalar;
|
|
||||||
/// "Decode" a scalar from a 32-byte array.
|
|
||||||
///
|
|
||||||
/// By "decode" here, what is really meant is applying key clamping by twiddling
|
|
||||||
/// some bits.
|
|
||||||
///
|
|
||||||
/// # Returns
|
|
||||||
///
|
|
||||||
/// A `Scalar`.
|
|
||||||
fn clamp_scalar(mut scalar: [u8; 32]) -> Scalar {
|
|
||||||
scalar[0] &= 248;
|
|
||||||
scalar[31] &= 127;
|
|
||||||
scalar[31] |= 64;
|
|
||||||
|
|
||||||
Scalar::from_bits(scalar)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The bare, byte-oriented x25519 function, exactly as specified in RFC7748.
|
/// The bare, byte-oriented x25519 function, exactly as specified in RFC7748.
|
||||||
///
|
///
|
||||||
/// This can be used with [`X25519_BASEPOINT_BYTES`] for people who
|
/// This can be used with [`X25519_BASEPOINT_BYTES`] for people who
|
||||||
/// cannot use the better, safer, and faster DH API.
|
/// cannot use the better, safer, and faster DH API.
|
||||||
fn x25519(k: [u8; 32], u: [u8; 32]) -> [u8; 32] {
|
fn x25519(k: [u8; 32], u: [u8; 32]) -> [u8; 32] {
|
||||||
(clamp_scalar(k) * MontgomeryPoint(u)).to_bytes()
|
MontgomeryPoint(u).mul_clamped(k).to_bytes()
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
let input_scalar: [u8; 32] = [
|
let input_scalar: [u8; 32] = [
|
||||||
|
|
@ -465,7 +448,7 @@ impl<'a> ShellCmdApi<'a> for Engine {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"ed2" => {
|
"ed2" => {
|
||||||
use ed25519_dalek::{Signature, Signer, SigningKey};
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
let good: &[u8] = "test message".as_bytes();
|
let good: &[u8] = "test message".as_bytes();
|
||||||
let bad: &[u8] = "wrong message".as_bytes();
|
let bad: &[u8] = "wrong message".as_bytes();
|
||||||
|
|
||||||
|
|
@ -501,19 +484,21 @@ impl<'a> ShellCmdApi<'a> for Engine {
|
||||||
use ed25519_dalek::*;
|
use ed25519_dalek::*;
|
||||||
// use ed25519::signature::Signature as _;
|
// use ed25519::signature::Signature as _;
|
||||||
use hex::FromHex;
|
use hex::FromHex;
|
||||||
let secret_key: &[u8] =
|
|
||||||
b"833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42";
|
|
||||||
let signing_key: &[u8] =
|
let signing_key: &[u8] =
|
||||||
|
b"833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42";
|
||||||
|
let public_key: &[u8] =
|
||||||
b"ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf";
|
b"ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf";
|
||||||
let message: &[u8] = b"616263";
|
let message: &[u8] = b"616263";
|
||||||
let signature: &[u8] = b"98a70222f0b8121aa9d30f813d683f809e462b469c7ff87639499bb94e6dae4131f85042463c2a355a2003d062adf5aaa10b8c61e636062aaad11c2a26083406";
|
let signature: &[u8] = b"98a70222f0b8121aa9d30f813d683f809e462b469c7ff87639499bb94e6dae4131f85042463c2a355a2003d062adf5aaa10b8c61e636062aaad11c2a26083406";
|
||||||
let msg_bytes = <[u8; 3]>::from_hex(message).unwrap();
|
let msg_bytes = <[u8; 3]>::from_hex(message).unwrap();
|
||||||
|
|
||||||
let secret_key_bytes = <[u8; SECRET_KEY_LENGTH]>::from_hex(secret_key).unwrap();
|
let signing_key_bytes = <[u8; SECRET_KEY_LENGTH]>::from_hex(signing_key).unwrap();
|
||||||
let signing_key_bytes = <[u8; PUBLIC_KEY_LENGTH]>::from_hex(signing_key).unwrap();
|
let public_key_bytes = <[u8; PUBLIC_KEY_LENGTH]>::from_hex(public_key).unwrap();
|
||||||
let signature_bytes = <[u8; SIGNATURE_LENGTH]>::from_hex(signature).unwrap();
|
let signature_bytes = <[u8; SIGNATURE_LENGTH]>::from_hex(signature).unwrap();
|
||||||
|
|
||||||
let signingkey: SigningKey = SigningKey::from_bytes(&signing_key_bytes);
|
let signingkey: SigningKey = SigningKey::from_bytes(&signing_key_bytes);
|
||||||
|
let expected_verifying_key = VerifyingKey::from_bytes(&public_key_bytes).unwrap();
|
||||||
|
assert_eq!(expected_verifying_key, signingkey.verifying_key());
|
||||||
let sig1: Signature = Signature::from_bytes(&signature_bytes);
|
let sig1: Signature = Signature::from_bytes(&signature_bytes);
|
||||||
|
|
||||||
//let mut prehash_for_signing = engine_sha512::Sha512::default(); // this defaults to Hw
|
//let mut prehash_for_signing = engine_sha512::Sha512::default(); // this defaults to Hw
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue