aboutsummaryrefslogtreecommitdiffstats
path: root/src/federation
diff options
context:
space:
mode:
Diffstat (limited to 'src/federation')
-rw-r--r--src/federation/attacks.rs17
-rw-r--r--src/federation/keys.rs17
2 files changed, 34 insertions, 0 deletions
diff --git a/src/federation/attacks.rs b/src/federation/attacks.rs
index d153f22..0d90461 100644
--- a/src/federation/attacks.rs
+++ b/src/federation/attacks.rs
@@ -1102,6 +1102,7 @@ fn federation_attack_61() {
#[test]
fn federation_attack_62() {
+ use super::vectors::{ECDSA_KEY, ECDSA_WRITE};
use base64::{Engine, engine::general_purpose::STANDARD as BASE64};
let mut fed = three();
let root = fed.root();
@@ -1150,6 +1151,22 @@ fn federation_attack_62() {
),
);
assert_eq!(fed.refused(commented), Refusal::None);
+ // Signed with an ECDSA key (the vectors'), its signature spelled otherwise: `s` high,
+ // or `r` longer. The write as it was signed is taken.
+ let mut first = Spec::first(&[&tv, &lass()], &[]);
+ first.parties[0].keys = vec![ECDSA_KEY.to_owned()];
+ let mut fed = Fed {
+ store: Store::new(first.root(), Vec::new()).expect("a root"),
+ first,
+ };
+ let event = super::jcs::read(ECDSA_WRITE.as_bytes()).expect("JCS");
+ let sig = event.get("sig").and_then(Json::as_str).expect("a sig");
+ let key = super::keys::key(ECDSA_KEY).expect("a key");
+ for other in super::keys::respelled(&key, sig) {
+ let respelled = ECDSA_WRITE.replace(sig, &other).into_bytes();
+ assert_eq!(fed.refused(respelled), Refusal::None);
+ }
+ fed.take(ECDSA_WRITE.as_bytes().to_vec());
}
#[test]
diff --git a/src/federation/keys.rs b/src/federation/keys.rs
index a795db7..fa13ec4 100644
--- a/src/federation/keys.rs
+++ b/src/federation/keys.rs
@@ -254,6 +254,23 @@ fn written(key: &Key, signature: &[u8]) -> Vec<u8> {
blob
}
+/// Of `sig`, an ECDSA signature by `key` as the federation spells it, two others of the
+/// same key and message that check as SSH checks them: `s` high, the order less `s`; and
+/// `r` with a zero byte more in front, the same number to SSH.
+#[cfg(test)]
+pub(crate) fn respelled(key: &Key, sig: &str) -> [String; 2] {
+ let blob = BASE64.decode(sig).expect("base64");
+ let rs = &blob[written(key, &[]).len()..];
+ let (r, s) = ecdsa_signature(rs).expect("r and s").split_scalars();
+ let high = p256::ecdsa::Signature::from_scalars(r, -s).expect("a signature");
+ let mut reader = Reader(rs);
+ let (r, s) = (reader.string().expect("r"), reader.string().expect("s"));
+ let mut longer = Vec::new();
+ string(&mut longer, &[&[0], r].concat());
+ string(&mut longer, s);
+ [mpints(&high), longer].map(|numbers| BASE64.encode(written(key, &numbers)))
+}
+
#[cfg(test)]
mod tests {
use super::*;