Skip to content

Commit bcc7b2d

Browse files
wolfmcnallywolfmcnally
committed
Added ed25519 signing.
1 parent 5ce8d9a commit bcc7b2d

File tree

8 files changed

+161
-22
lines changed

8 files changed

+161
-22
lines changed

‎Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ documentation = "https://docs.rs/bc-crypto"
1313

1414
[dependencies]
1515
bc-rand = "^0.2.0"
16+
rand = "^0.8.5"
1617
sha2 = "^0.10.6"
1718
hmac = "^0.12.1"
1819
pbkdf2 = "^0.12.1"
@@ -26,6 +27,7 @@ secp256k1 = { git = "https://github.com/rust-bitcoin/rust-secp256k1/", branch =
2627
x25519-dalek = {version = "2.0.0-rc.2", features = ["static_secrets"]}
2728
thiserror = "^1.0.48"
2829
hex = "^0.4.3"
30+
ed25519-dalek = {version = "2.1.1", features = ["rand_core"]}
2931

3032
[dev-dependencies]
3133
hex-literal = "^0.4.1"

‎src/ecdsa_keys.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
use bc_rand::RandomNumberGenerator;
22
use secp256k1::{Secp256k1, SecretKey, PublicKey, Keypair, constants::{PUBLIC_KEY_SIZE, SECRET_KEY_SIZE, UNCOMPRESSED_PUBLIC_KEY_SIZE}};
33

4-
use crate::{ECDSA_PRIVATE_KEY_SIZE, hash::hkdf_hmac_sha256, SCHNORR_PUBLIC_KEY_SIZE};
4+
pub const ECDSA_PRIVATE_KEY_SIZE: usize = 32;
5+
pub const ECDSA_PUBLIC_KEY_SIZE: usize = 33;
6+
pub const ECDSA_UNCOMPRESSED_PUBLIC_KEY_SIZE: usize = 65;
7+
pub const ECDSA_MESSAGE_HASH_SIZE: usize = 32;
8+
pub const ECDSA_SIGNATURE_SIZE : usize = 64;
9+
pub const SCHNORR_PUBLIC_KEY_SIZE: usize = 32;
10+
11+
use crate::hash::hkdf_hmac_sha256;
512

613
/// Generate a new ECDSA private key using the given random number generator.
714
pub fn ecdsa_new_private_key_using(rng: &mut impl RandomNumberGenerator) -> [u8; SECRET_KEY_SIZE] {

‎src/ed25519_signing.rs‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
use chacha20poly1305::aead::rand_core::CryptoRngCore;
2+
use ed25519_dalek::ed25519::signature::Signer;
3+
use ed25519_dalek::SigningKey;
4+
use ed25519_dalek::Signature;
5+
6+
pub const ED25519_PUBLIC_KEY_LENGTH: usize = ed25519_dalek::PUBLIC_KEY_LENGTH;
7+
pub const ED25519_SECRET_KEY_LENGTH: usize = ed25519_dalek::SECRET_KEY_LENGTH;
8+
pub const ED25519_SIGNATURE_LENGTH: usize = ed25519_dalek::SIGNATURE_LENGTH;
9+
10+
pub fn ed25519_new_private_key_using(rng: &mut impl CryptoRngCore) -> [u8; ED25519_SECRET_KEY_LENGTH] {
11+
SigningKey::generate(rng).to_bytes()
12+
}
13+
14+
pub fn ed25519_public_key_from_private_key(private_key: &[u8; ED25519_SECRET_KEY_LENGTH]) -> [u8; ED25519_PUBLIC_KEY_LENGTH] {
15+
let signing_key = SigningKey::from_bytes(private_key);
16+
signing_key.verifying_key().to_bytes()
17+
}
18+
19+
pub fn ed25519_sign(
20+
private_key: &[u8; ED25519_SECRET_KEY_LENGTH],
21+
message: &[u8]
22+
) -> [u8; ED25519_SIGNATURE_LENGTH] {
23+
let signing_key = SigningKey::from_bytes(private_key);
24+
signing_key.try_sign(message).unwrap().to_bytes()
25+
}
26+
27+
pub fn ed25519_verify(
28+
public_key: &[u8; ED25519_PUBLIC_KEY_LENGTH],
29+
message: &[u8],
30+
signature: &[u8; ED25519_SIGNATURE_LENGTH]
31+
) -> bool {
32+
let verifying_key = ed25519_dalek::VerifyingKey::from_bytes(public_key).unwrap();
33+
let signature = Signature::from_bytes(signature);
34+
verifying_key.verify_strict(message, &signature).is_ok()
35+
}
36+
37+
#[cfg(test)]
38+
mod tests {
39+
use crate::{ed25519_new_private_key_using, ed25519_public_key_from_private_key, ed25519_sign, ed25519_verify, ED25519_PUBLIC_KEY_LENGTH, ED25519_SECRET_KEY_LENGTH, ED25519_SIGNATURE_LENGTH};
40+
use hex_literal::hex;
41+
42+
#[test]
43+
fn test_ed25519_signing() {
44+
use bc_rand::make_fake_random_number_generator;
45+
46+
const MESSAGE: &[u8] = b"Ladies and Gentlemen of the class of '99: If I could offer you only one tip for the future, sunscreen would be it.";
47+
48+
let mut rng = make_fake_random_number_generator();
49+
let private_key = ed25519_new_private_key_using(&mut rng);
50+
assert_eq!(private_key, hex!("7e061813569f540fb501367178373e8859424ceddfc39407bb066f2953f140dc"));
51+
let public_key = ed25519_public_key_from_private_key(&private_key);
52+
assert_eq!(public_key, hex!("ec0aa9766e8c92beae719bdb8383479a6b21a8b39c985cf34e2cb39fb22332f2"));
53+
let signature = ed25519_sign(&private_key, MESSAGE);
54+
assert_eq!(signature, hex!("440172ff3089027029cc746d20d2358a5c0f833a273ecea8af0e343a85466af787288427740598a447f48a12e82b7afcb016af7e07a2f559f0fbff9cbb718806"));
55+
assert!(ed25519_verify(&public_key, MESSAGE, &signature));
56+
}
57+
58+
#[test]
59+
fn test_ed25519_vectors() {
60+
struct TestVector {
61+
secret_key: [u8; ED25519_SECRET_KEY_LENGTH],
62+
public_key: [u8; ED25519_PUBLIC_KEY_LENGTH],
63+
message: Vec<u8>,
64+
signature: [u8; ED25519_SIGNATURE_LENGTH],
65+
}
66+
67+
// Test vectors from RFC 8032
68+
// https://www.rfc-editor.org/rfc/rfc8032#page-24
69+
let test_vectors = [
70+
TestVector {
71+
secret_key: hex!("9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60"),
72+
public_key: hex!("d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a"),
73+
message: hex!("").to_vec(),
74+
signature: hex!("e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b")
75+
},
76+
TestVector {
77+
secret_key: hex!("4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb"),
78+
public_key: hex!("3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c"),
79+
message: hex!("72").to_vec(),
80+
signature: hex!("92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00")
81+
},
82+
TestVector {
83+
secret_key: hex!("c5aa8df43f9f837bedb7442f31dcb7b166d38535076f094b85ce3a2e0b4458f7"),
84+
public_key: hex!("fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025"),
85+
message: hex!("af82").to_vec(),
86+
signature: hex!("6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a")
87+
},
88+
TestVector {
89+
secret_key: hex!("f5e5767cf153319517630f226876b86c8160cc583bc013744c6bf255f5cc0ee5"),
90+
public_key: hex!("278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e"),
91+
message: hex!("08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d879de7c0046dc4996d9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4feba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbefefd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed185ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2d17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f27088d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc2732e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b0707e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128bab27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51addd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429ec96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb751fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34dff7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08d78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e488acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a32ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5fb93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b50d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380db2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0").to_vec(),
92+
signature: hex!("0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03")
93+
},
94+
];
95+
96+
for test_vector in test_vectors.iter() {
97+
assert_eq!(ed25519_public_key_from_private_key(&test_vector.secret_key), test_vector.public_key);
98+
assert!(ed25519_verify(&test_vector.public_key, &test_vector.message, &test_vector.signature));
99+
}
100+
}
101+
}

‎src/hash.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ use hmac::{Hmac, Mac};
33
use pbkdf2::pbkdf2_hmac;
44
use hkdf::Hkdf;
55

6-
use crate::{CRC32_SIZE, SHA256_SIZE, SHA512_SIZE};
6+
pub const CRC32_SIZE: usize = 4;
7+
pub const SHA256_SIZE: usize = 32;
8+
pub const SHA512_SIZE: usize = 64;
79

810
/// Computes the CRC-32 checksum of the given data.
911
pub fn crc32(data: impl AsRef<[u8]>) -> u32 {

‎src/lib.rs‎

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,20 @@
2727
//! bc-crypto = "0.5.0"
2828
//! ```
2929
30-
pub const CRC32_SIZE: usize = 4;
31-
pub const SHA256_SIZE: usize = 32;
32-
pub const SHA512_SIZE: usize = 64;
33-
pub const SYMMETRIC_KEY_SIZE: usize = 32;
34-
pub const SYMMETRIC_NONCE_SIZE: usize = 12;
35-
pub const SYMMETRIC_AUTH_SIZE: usize = 16;
36-
pub const ECDSA_PRIVATE_KEY_SIZE: usize = 32;
37-
pub const ECDSA_PUBLIC_KEY_SIZE: usize = 33;
38-
pub const ECDSA_UNCOMPRESSED_PUBLIC_KEY_SIZE: usize = 65;
39-
pub const ECDSA_MESSAGE_HASH_SIZE: usize = 32;
40-
pub const ECDSA_SIGNATURE_SIZE : usize = 64;
41-
pub const SCHNORR_PUBLIC_KEY_SIZE: usize = 32;
42-
pub const SCHNORR_SIGNATURE_SIZE: usize = 64;
43-
pub const X25519_PRIVATE_KEY_SIZE: usize = 32;
44-
pub const X25519_PUBLIC_KEY_SIZE: usize = 32;
45-
4630
/// The `hash` module contains functions for hashing data.
4731
pub mod hash;
32+
pub use hash::{
33+
sha256,
34+
double_sha256,
35+
sha512,
36+
hmac_sha256,
37+
hmac_sha512,
38+
pbkdf2_hmac_sha256,
39+
hkdf_hmac_sha256,
40+
CRC32_SIZE,
41+
SHA256_SIZE,
42+
SHA512_SIZE,
43+
};
4844

4945
mod memzero;
5046
pub use memzero::{memzero, memzero_vec_vec_u8};
@@ -54,7 +50,10 @@ pub use symmetric_encryption::{
5450
aead_chacha20_poly1305_encrypt_with_aad,
5551
aead_chacha20_poly1305_encrypt,
5652
aead_chacha20_poly1305_decrypt_with_aad,
57-
aead_chacha20_poly1305_decrypt
53+
aead_chacha20_poly1305_decrypt,
54+
SYMMETRIC_KEY_SIZE,
55+
SYMMETRIC_NONCE_SIZE,
56+
SYMMETRIC_AUTH_SIZE,
5857
};
5958

6059
mod public_key_encryption;
@@ -64,6 +63,8 @@ pub use public_key_encryption:: {
6463
x25519_derive_agreement_private_key,
6564
x25519_derive_signing_private_key,
6665
x25519_shared_key,
66+
X25519_PRIVATE_KEY_SIZE,
67+
X25519_PUBLIC_KEY_SIZE,
6768
};
6869

6970
mod ecdsa_keys;
@@ -74,6 +75,12 @@ pub use ecdsa_keys::{
7475
ecdsa_compress_public_key,
7576
ecdsa_derive_private_key,
7677
schnorr_public_key_from_private_key,
78+
ECDSA_PRIVATE_KEY_SIZE,
79+
ECDSA_PUBLIC_KEY_SIZE,
80+
ECDSA_UNCOMPRESSED_PUBLIC_KEY_SIZE,
81+
ECDSA_MESSAGE_HASH_SIZE,
82+
ECDSA_SIGNATURE_SIZE,
83+
SCHNORR_PUBLIC_KEY_SIZE,
7784
};
7885

7986
mod ecdsa_signing;
@@ -88,6 +95,18 @@ pub use schnorr_signing::{
8895
schnorr_sign_using,
8996
schnorr_sign_with_aux_rand,
9097
schnorr_verify,
98+
SCHNORR_SIGNATURE_SIZE,
99+
};
100+
101+
mod ed25519_signing;
102+
pub use ed25519_signing::{
103+
ed25519_new_private_key_using,
104+
ed25519_public_key_from_private_key,
105+
ed25519_sign,
106+
ed25519_verify,
107+
ED25519_SECRET_KEY_LENGTH,
108+
ED25519_PUBLIC_KEY_LENGTH,
109+
ED25519_SIGNATURE_LENGTH,
91110
};
92111

93112
mod error;

‎src/public_key_encryption.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
use crate::{X25519_PRIVATE_KEY_SIZE, X25519_PUBLIC_KEY_SIZE, hash::hkdf_hmac_sha256, SYMMETRIC_KEY_SIZE};
1+
use crate::{hash::hkdf_hmac_sha256, SYMMETRIC_KEY_SIZE};
22
use bc_rand::RandomNumberGenerator;
33
use x25519_dalek::{PublicKey, StaticSecret};
44

5+
pub const X25519_PRIVATE_KEY_SIZE: usize = 32;
6+
pub const X25519_PUBLIC_KEY_SIZE: usize = 32;
7+
58
/// Create a new X25519 private key using the given random number generator.
69
pub fn x25519_new_agreement_private_key_using(rng: &mut impl RandomNumberGenerator) -> [u8; X25519_PRIVATE_KEY_SIZE] {
710
rng.random_data(X25519_PRIVATE_KEY_SIZE).try_into().unwrap()

‎src/schnorr_signing.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use bc_rand::{ RandomNumberGenerator, SecureRandomNumberGenerator};
22
use secp256k1::{schnorr::Signature, Keypair, Secp256k1, SecretKey, XOnlyPublicKey};
3-
use crate::{SCHNORR_SIGNATURE_SIZE, SCHNORR_PUBLIC_KEY_SIZE, ECDSA_PRIVATE_KEY_SIZE};
3+
use crate::{SCHNORR_PUBLIC_KEY_SIZE, ECDSA_PRIVATE_KEY_SIZE};
4+
5+
pub const SCHNORR_SIGNATURE_SIZE: usize = 64;
46

57
pub fn schnorr_sign(
68
ecdsa_private_key: &[u8; ECDSA_PRIVATE_KEY_SIZE],

‎src/symmetric_encryption.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
use crate::error::Error;
12
use chacha20poly1305::{ChaCha20Poly1305, KeyInit, AeadInPlace};
23

3-
use crate::{Error, SYMMETRIC_KEY_SIZE, SYMMETRIC_NONCE_SIZE, SYMMETRIC_AUTH_SIZE};
4+
pub const SYMMETRIC_KEY_SIZE: usize = 32;
5+
pub const SYMMETRIC_NONCE_SIZE: usize = 12;
6+
pub const SYMMETRIC_AUTH_SIZE: usize = 16;
47

58
/// Symmetrically encrypts the given plaintext using ChaCha20-Poly1305 and the given
69
/// additional authenticated data (AAD).

0 commit comments

Comments
 (0)