slipenkomk/sequoia-sq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the Autocrypt gossip CA framework.

Browse Source 
- Fixes #350.
This commit is contained in:
Justus Winter 2024-10-21 14:40:34 +02:00
parent 39d2e727f7
commit 54c70fb597
No known key found for this signature in database
GPG Key ID: 686F55B4AB2B3386
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/commands/autocrypt.rs
View File

@ -125,20 +125,11 @@ fn import<'store, 'rstore>(mut sq: Sq<'store, 'rstore>,
}
for h in ac.headers.into_iter().filter(|h| h.header_type == Gossip) {
if let Some(addr) = h.attributes.iter()
if let Some(_addr) = h.attributes.iter()
.find_map(|a| (&a.key == "addr").then(|| a.value.clone()))
{
if let Some(cert) = h.key {
if let Ok((ca, _)) = sq.certd_or_else()
.and_then(|certd| certd.shadow_ca_autocrypt_gossip_for(
&sender_cert, from_addr))
{
acc.append(&mut certify_downloads(
&mut sq, ca,
vec![cert], Some(&addr[..])));
} else {
acc.push(cert);
}
acc.push(cert);
}
}
}

4
tests/integration/sq_autocrypt.rs
View File

@ -58,14 +58,14 @@ fn sq_autocrypt_import() -> Result<()>
// We can now weakly authenticate the peers.
let mut cmd = sq.command();
cmd.arg("pki").arg("authenticate")
.arg("--amount=1")
.arg("--gossip")
.arg("CBCD8F030588653EEDD7E2659B7DD433F254904A")
.arg("--email").arg("justus@sequoia-pgp.org");
sq.run(cmd, true);
let mut cmd = sq.command();
cmd.arg("pki").arg("authenticate")
.arg("--amount=1")
.arg("--gossip")
.arg("BB6B7E5F8343B2BE990EB7A7F3AF066F267892C1")
.arg("--email").arg("hilal-maria@probier.email");
sq.run(cmd, true);