add RFC7748 test vectors for diffie hellman

This commit is contained in:
bunnie 2021-06-28 19:01:22 +08:00
parent e01676d563
commit 8da62390ad
4 changed files with 86 additions and 11 deletions

4
Cargo.lock generated
View file

@ -505,7 +505,6 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
version = "3.1.0"
source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#1a79b76e90d49366b47eb98398a6104678686c15"
dependencies = [
"byteorder",
"digest",
@ -544,11 +543,10 @@ dependencies = [
[[package]]
name = "ed25519-dalek"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
dependencies = [
"curve25519-dalek",
"ed25519",
"log",
"rand 0.7.3",
"sha2",
"zeroize",

View file

@ -93,9 +93,9 @@ xous-macros = {path = "macros"}
# prefer hardware-accelerated versions of services
sha2 = {path = "services/engine-sha512", package = "engine-sha512"}
[patch.crates-io.curve25519-dalek]
git="https://github.com/betrusted-io/curve25519-dalek.git"
branch="main"
#path = "../curve25519-dalek"
#git="https://github.com/betrusted-io/curve25519-dalek.git"
#branch="main"
path = "../curve25519-dalek"
default-features = false
features = ["u32_backend", "betrusted"]

View file

@ -42,9 +42,9 @@ rand_core = "0.5"
hex = {version = "0.4.3", default-features = false, features = []}
[dependencies.curve25519-dalek]
# don't forget the Cargo.toml patch.crates.io file to patch over third-party dependencies as well!
git="https://github.com/betrusted-io/curve25519-dalek.git"
branch="main"
#path = "../../../curve25519-dalek"
#git="https://github.com/betrusted-io/curve25519-dalek.git"
#branch="main"
path = "../../../curve25519-dalek"
default-features = false
features = ["u32_backend", "betrusted"]
@ -54,8 +54,8 @@ default-features = false
features = ["u32_backend"]
[dependencies.ed25519-dalek]
version = "1.0.1"
#path = "../../../ed25519-dalek"
#version = "1.0.1"
path = "../../../ed25519-dalek"
default-features = false
features = ["u32_backend", "rand"]

View file

@ -293,6 +293,83 @@ impl<'a> ShellCmdApi<'a> for Engine {
} else {
write!(ret, "x25519 key exchange fail").unwrap();
}
/////////////////////// fixed vectors from x25519-dalek tests
use curve25519_dalek::scalar::Scalar;
use curve25519_dalek::montgomery::MontgomeryPoint;
/// "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.
///
/// This can be used with [`X25519_BASEPOINT_BYTES`] for people who
/// cannot use the better, safer, and faster DH API.
fn x25519(k: [u8; 32], u: [u8; 32]) -> [u8; 32] {
(clamp_scalar(k) * MontgomeryPoint(u)).to_bytes()
}
{
let input_scalar: [u8; 32] = [
0xa5, 0x46, 0xe3, 0x6b, 0xf0, 0x52, 0x7c, 0x9d, 0x3b, 0x16, 0x15, 0x4b, 0x82, 0x46,
0x5e, 0xdd, 0x62, 0x14, 0x4c, 0x0a, 0xc1, 0xfc, 0x5a, 0x18, 0x50, 0x6a, 0x22, 0x44,
0xba, 0x44, 0x9a, 0xc4,
];
let input_point: [u8; 32] = [
0xe6, 0xdb, 0x68, 0x67, 0x58, 0x30, 0x30, 0xdb, 0x35, 0x94, 0xc1, 0xa4, 0x24, 0xb1,
0x5f, 0x7c, 0x72, 0x66, 0x24, 0xec, 0x26, 0xb3, 0x35, 0x3b, 0x10, 0xa9, 0x03, 0xa6,
0xd0, 0xab, 0x1c, 0x4c,
];
let expected: [u8; 32] = [
0xc3, 0xda, 0x55, 0x37, 0x9d, 0xe9, 0xc6, 0x90, 0x8e, 0x94, 0xea, 0x4d, 0xf2, 0x8d,
0x08, 0x4f, 0x32, 0xec, 0xcf, 0x03, 0x49, 0x1c, 0x71, 0xf7, 0x54, 0xb4, 0x07, 0x55,
0x77, 0xa2, 0x85, 0x52,
];
let result = x25519(input_scalar, input_point);
if result != expected {
write!(ret, "x25519 vector 1 failed!\n").unwrap();
log::error!("result: {:x?}", result);
log::error!("expected: {:x?}", expected);
} else {
write!(ret, "x25519 vector 1 passed\n").unwrap();
}
}
{
let input_scalar: [u8; 32] = [
0x4b, 0x66, 0xe9, 0xd4, 0xd1, 0xb4, 0x67, 0x3c, 0x5a, 0xd2, 0x26, 0x91, 0x95, 0x7d,
0x6a, 0xf5, 0xc1, 0x1b, 0x64, 0x21, 0xe0, 0xea, 0x01, 0xd4, 0x2c, 0xa4, 0x16, 0x9e,
0x79, 0x18, 0xba, 0x0d,
];
let input_point: [u8; 32] = [
0xe5, 0x21, 0x0f, 0x12, 0x78, 0x68, 0x11, 0xd3, 0xf4, 0xb7, 0x95, 0x9d, 0x05, 0x38,
0xae, 0x2c, 0x31, 0xdb, 0xe7, 0x10, 0x6f, 0xc0, 0x3c, 0x3e, 0xfc, 0x4c, 0xd5, 0x49,
0xc7, 0x15, 0xa4, 0x93,
];
let expected: [u8; 32] = [
0x95, 0xcb, 0xde, 0x94, 0x76, 0xe8, 0x90, 0x7d, 0x7a, 0xad, 0xe4, 0x5c, 0xb4, 0xb8,
0x73, 0xf8, 0x8b, 0x59, 0x5a, 0x68, 0x79, 0x9f, 0xa1, 0x52, 0xe6, 0xf8, 0xf7, 0x64,
0x7a, 0xac, 0x79, 0x57,
];
let result = x25519(input_scalar, input_point);
if result != expected {
write!(ret, "x25519 vector 2 failed!\n").unwrap();
log::error!("result: {:x?}", result);
log::error!("expected: {:x?}", expected);
} else {
write!(ret, "x25519 vector 2 passed\n").unwrap();
}
}
}
"ed2" => {
use ed25519_dalek::{Keypair, Signature, Signer};