Skip to content

Commit 10e7b09

Browse files
committed
Move ed25519 checkpoint signer to tlog_tiles crate
* Move StandardEd25519CheckpointSigner to tlog_tiles crate, as it is the default checkpoint signer used by the tlog-tiles spec, and drop the 'Standard' prefix. * Rename StandardSigner -> Ed25519NoteSigner, signed_note::{Signer, Verifier} -> signed_note::Note{Signer,Verifier}
1 parent 298dd83 commit 10e7b09

File tree

13 files changed

+125
-133
lines changed

13 files changed

+125
-133
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ console_error_panic_hook = "0.1.1"
3838
console_log = { version = "1.0" }
3939
criterion = { version = "0.5", features = ["html_reports"] }
4040
der = "0.7.9"
41-
ed25519-dalek = "2.1.1"
41+
ed25519-dalek = { version = "2.1.1", features = ["pem"] }
4242
futures-executor = "0.3.31"
4343
futures-util = "0.3.31"
4444
getrandom = { version = "0.2", features = ["js"] }

crates/ct_worker/src/ctlog.rs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use futures_util::future::try_join_all;
2828
use log::{debug, error, info, trace, warn};
2929
use serde::{Deserialize, Serialize};
3030
use sha2::{Digest, Sha256};
31-
use signed_note::{Verifier as NoteVerifier, VerifierList};
31+
use signed_note::{NoteVerifier, VerifierList};
3232
use static_ct_api::TreeWithTimestamp;
3333
use std::collections::HashMap;
3434
use std::time::Duration;
@@ -1189,10 +1189,10 @@ mod tests {
11891189
Rng, RngCore, SeedableRng,
11901190
};
11911191
use signed_note::{Note, VerifierList};
1192-
use static_ct_api::{PrecertData, StandardEd25519CheckpointSigner, StaticCTCheckpointSigner};
1192+
use static_ct_api::{PrecertData, StaticCTCheckpointSigner};
11931193
use static_ct_api::{StaticCTLogEntry, StaticCTPendingLogEntry};
11941194
use std::cell::RefCell;
1195-
use tlog_tiles::{Checkpoint, TlogTile};
1195+
use tlog_tiles::{Checkpoint, Ed25519CheckpointSigner, TlogTile};
11961196

11971197
#[test]
11981198
fn test_sequence_one_leaf_short() {
@@ -1510,11 +1510,9 @@ mod tests {
15101510
.unwrap_err();
15111511

15121512
let mut c = log.config.clone_without_signers();
1513-
let checkpoint_signer = StandardEd25519CheckpointSigner::new(
1514-
&c.origin,
1515-
Ed25519SigningKey::generate(&mut OsRng),
1516-
)
1517-
.unwrap();
1513+
let checkpoint_signer =
1514+
Ed25519CheckpointSigner::new(&c.origin, Ed25519SigningKey::generate(&mut OsRng))
1515+
.unwrap();
15181516
c.checkpoint_signers = vec![Box::new(checkpoint_signer)];
15191517
block_on(SequenceState::load::<StaticCTLogEntry>(
15201518
&c,
@@ -2114,11 +2112,9 @@ mod tests {
21142112
let signer =
21152113
StaticCTCheckpointSigner::new(&origin, EcdsaSigningKey::random(&mut rng))
21162114
.unwrap();
2117-
let witness = StandardEd25519CheckpointSigner::new(
2118-
&origin,
2119-
Ed25519SigningKey::generate(&mut rng),
2120-
)
2121-
.unwrap();
2115+
let witness =
2116+
Ed25519CheckpointSigner::new(&origin, Ed25519SigningKey::generate(&mut rng))
2117+
.unwrap();
21222118
vec![Box::new(signer), Box::new(witness)]
21232119
};
21242120

crates/ct_worker/src/sequencer_do.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@ use crate::{
1313
use ctlog::{CreateError, LogConfig, PoolState, SequenceState};
1414
use futures_util::future::join_all;
1515
use log::{info, warn, Level};
16-
use static_ct_api::{
17-
StandardEd25519CheckpointSigner, StaticCTCheckpointSigner, StaticCTLogEntry,
18-
StaticCTPendingLogEntry,
19-
};
16+
use static_ct_api::{StaticCTCheckpointSigner, StaticCTLogEntry, StaticCTPendingLogEntry};
2017
use std::str::FromStr;
2118
use std::time::Duration;
22-
use tlog_tiles::{CheckpointSigner, LogEntry, PendingLogEntry};
19+
use tlog_tiles::{CheckpointSigner, Ed25519CheckpointSigner, LogEntry, PendingLogEntry};
2320
use tokio::sync::Mutex;
2421
#[allow(clippy::wildcard_imports)]
2522
use worker::*;
@@ -51,10 +48,9 @@ impl DurableObject for Sequencer {
5148
let signer = StaticCTCheckpointSigner::new(origin, signing_key).map_err(|e| {
5249
Error::RustError(format!("could not create static-ct checkpoint signer: {e}"))
5350
})?;
54-
let witness =
55-
StandardEd25519CheckpointSigner::new(origin, witness_key).map_err(|e| {
56-
Error::RustError(format!("could not create ed25519 checkpoint signer: {e}"))
57-
})?;
51+
let witness = Ed25519CheckpointSigner::new(origin, witness_key).map_err(|e| {
52+
Error::RustError(format!("could not create ed25519 checkpoint signer: {e}"))
53+
})?;
5854

5955
let out: Vec<Box<dyn CheckpointSigner>> = vec![Box::new(signer), Box::new(witness)];
6056
Ok(out)

crates/signed_note/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ crate-type = ["rlib"]
2323

2424
[dependencies]
2525
base64.workspace = true
26-
byteorder.workspace = true
2726
ed25519-dalek = { workspace = true, features=["alloc", "rand_core"] }
2827
rand_core.workspace = true
2928
sha2.workspace = true

crates/signed_note/benches/benchmark_verify.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//! - [note_test.go](https://cs.opensource.google/go/x/mod/+/refs/tags/v0.21.0:sumdb/note/note_test.go)
1414
1515
use criterion::{criterion_group, criterion_main, Criterion};
16-
use signed_note::{Note, NoteError, StandardVerifier, VerifierList};
16+
use signed_note::{Ed25519NoteVerifier, Note, NoteError, VerifierList};
1717
use std::hint::black_box;
1818

1919
fn benchmark_verify(c: &mut Criterion) {
@@ -23,7 +23,7 @@ fn benchmark_verify(c: &mut Criterion) {
2323
\n\
2424
— PeterNeumann x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM=\n".as_bytes();
2525

26-
let verifier = StandardVerifier::new(vkey).unwrap();
26+
let verifier = Ed25519NoteVerifier::new(vkey).unwrap();
2727

2828
c.bench_function("Sig0", |b| {
2929
b.iter(|| {

0 commit comments

Comments
 (0)