Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ walkdir = "2.5.0"

[dev-dependencies]
pretty_assertions = "1.4.1"
ssh-key = "0.6.0"
ssh-key = { version = "0.6.0", features = ["ed25519"] }
tempfile = "3.24.0"

[dev-dependencies.sequoia-openpgp]
Expand Down
2 changes: 1 addition & 1 deletion src/pgp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ fn gpg_v4_signatures_can_be_verified() {
}

#[test]
fn pgp_v4_signatures_can_be_verified() {
fn pgp_v4_signatures_can_be_generated_and_verified() {
// create message
let message = {
let manifest = Manifest {
Expand Down
47 changes: 46 additions & 1 deletion src/ssh.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::*;

#[test]
fn ssh_signatures_can_be_verified() {
fn ssh_keygen_signatures_can_be_verified() {
let message_bytes = include_bytes!("../static/ssh-test/message");
let signature_str = include_str!("../static/ssh-test/message.sig");
let public_key_str = include_str!("../static/ssh-test/id_ed25519.pub");
Expand Down Expand Up @@ -49,3 +49,48 @@ fn ssh_signatures_can_be_verified() {
eprintln!("SSH_PUBLIC_KEY: {public_key}");
eprintln!("SSH_SIGNATURE: {signature}");
}

#[test]
fn ssh_signatures_can_be_generated_and_verified() {
use {
rand::rngs::OsRng,
ssh_key::{Algorithm, HashAlg},
};

let message = {
let manifest = Manifest {
files: Directory::new(),
notes: Vec::new(),
};

Message {
fingerprint: manifest.fingerprint(),
time: None,
}
.serialize()
};

let private_key = ssh_key::PrivateKey::random(&mut OsRng, Algorithm::Ed25519).unwrap();

let ssh_sig = private_key
.sign("filepack", HashAlg::Sha512, message.as_bytes())
.unwrap();

let signature = {
let sig_bytes: [u8; 64] = ssh_sig.signature_bytes().try_into().unwrap();
Signature::new(
SignatureScheme::Ssh,
ed25519_dalek::Signature::from_bytes(&sig_bytes),
)
};

let public_key = {
let ssh_key::public::KeyData::Ed25519(ed25519_key) = private_key.public_key().key_data() else {
panic!("expected ed25519");
};

PublicKey::from_bytes(ed25519_key.0)
};

signature.verify(&message, public_key).unwrap();
}