Skip to content

Rename OpenPGP files from .gpg to .pgp #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2025
Merged

Rename OpenPGP files from .gpg to .pgp #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ kubectl apply -f contrib/k8s.yaml -n apt-swarm
To ascii armor the pgp key use this command:

```
sq packet armor < contrib/signal-desktop-keyring.gpg
sq packet armor < contrib/signal-desktop-keyring.pgp
```

Then write a configuration like this:
Expand Down
0 ...rib/debian-archive-bullseye-automatic.gpg → ...rib/debian-archive-bullseye-automatic.pgp
View file
Open in desktop
File renamed without changes.
0 ...n-archive-bullseye-security-automatic.gpg → ...n-archive-bullseye-security-automatic.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/debian-archive-bullseye-stable.gpg → contrib/debian-archive-bullseye-stable.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/debian-archive-buster-automatic.gpg → contrib/debian-archive-buster-automatic.pgp
View file
Open in desktop
File renamed without changes.
0 ...ian-archive-buster-security-automatic.gpg → ...ian-archive-buster-security-automatic.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/debian-archive-buster-stable.gpg → contrib/debian-archive-buster-stable.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/debian-archive-stretch-automatic.gpg → contrib/debian-archive-stretch-automatic.pgp
View file
Open in desktop
File renamed without changes.
0 ...an-archive-stretch-security-automatic.gpg → ...an-archive-stretch-security-automatic.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/debian-archive-stretch-stable.gpg → contrib/debian-archive-stretch-stable.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/docker-keyring.gpg → contrib/docker-keyring.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/rust-lang-release-key.gpg → contrib/rust-lang-release-key.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/signal-desktop-keyring.gpg → contrib/signal-desktop-keyring.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/spotify-keyring.gpg → contrib/spotify-keyring.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/steam-keyring.gpg → contrib/steam-keyring.pgp
View file
Open in desktop
File renamed without changes.
0 contrib/torproject-deb-archive.gpg → contrib/torproject-deb-archive.pgp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/decanonicalize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use apt_swarm::signed::Signed;
use libfuzzer_sys::fuzz_target;

lazy_static::lazy_static! {
static ref KEYRING: Keyring = Keyring::new(include_bytes!("../../contrib/signal-desktop-keyring.gpg")).unwrap();
static ref KEYRING: Keyring = Keyring::new(include_bytes!("../../contrib/signal-desktop-keyring.pgp")).unwrap();
}

fuzz_target!(|data: &[u8]| {
Expand Down
6 changes: 3 additions & 3 deletions src/signed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ Aee63sxMlmRBCwC+QKeH
fn test_check_signature() -> Result<()> {
let (signed, remaining) = Signed::from_bytes(IN_RELEASE)?;
assert_eq!(remaining, b"");
let keyring = Keyring::new(include_bytes!("../contrib/signal-desktop-keyring.gpg"))?;
let keyring = Keyring::new(include_bytes!("../contrib/signal-desktop-keyring.pgp"))?;
let canonical = signed.canonicalize(Some(&keyring))?;
assert_eq!(canonical, &[("DBA36B5181D0C816F630E889D980A17457F6FB06".parse().ok(), Signed {
content: BString::from(b"Origin: . xenial
Expand Down Expand Up @@ -1682,10 +1682,10 @@ EXyj
let mut keyring = Keyring::default();

keyring.add_keyring(include_bytes!(
"../contrib/debian-archive-bullseye-automatic.gpg"
"../contrib/debian-archive-bullseye-automatic.pgp"
))?;
keyring.add_keyring(include_bytes!(
"../contrib/debian-archive-bullseye-stable.gpg"
"../contrib/debian-archive-bullseye-stable.pgp"
))?;

let content = b"Origin: Debian
Expand Down
6 changes: 3 additions & 3 deletions src/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ mod tests {
init();

let keyring =
Keyring::new(include_bytes!("../contrib/signal-desktop-keyring.gpg")).unwrap();
Keyring::new(include_bytes!("../contrib/signal-desktop-keyring.pgp")).unwrap();
let (_, mut db_a, mut db_b) = open_temp_dbs().await.unwrap();
run_sync(&keyring, &mut db_a, &mut db_b).await.unwrap();

Expand All @@ -560,7 +560,7 @@ mod tests {
init();

let keyring =
Keyring::new(include_bytes!("../contrib/signal-desktop-keyring.gpg")).unwrap();
Keyring::new(include_bytes!("../contrib/signal-desktop-keyring.pgp")).unwrap();
let (_, mut db_a, mut db_b) = open_temp_dbs().await.unwrap();

let data = [
Expand Down Expand Up @@ -730,7 +730,7 @@ R4AjBHbzlyIGpU5BGNn3
init();

let keyring =
Keyring::new(include_bytes!("../contrib/signal-desktop-keyring.gpg")).unwrap();
Keyring::new(include_bytes!("../contrib/signal-desktop-keyring.pgp")).unwrap();
let (_, mut db_a, mut db_b) = open_temp_dbs().await.unwrap();

let data = [
Expand Down