Skip to content

Commit 09bc9c1

Browse files
committed
Use OpenPGP instead of GPG when referring to the spec or its artifacts
While GPG is still one of the most prevalent implementations, it is just one among many. We are dealing here with OpenPGP artifacts, so spell that out explicitly. This is more relevant now that GnuPG has opted out of the IETF OpenPGP working group, and will not be implementing future revisions of the specification.
1 parent 6090627 commit 09bc9c1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/ISSUE_TEMPLATE/join.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ body:
2828
id: signed-message
2929
attributes:
3030
label: Your signed membership application
31-
description: Please prove your association with Debian with a gpg-signed membership request.
31+
description: Please prove your association with Debian with an OpenPGP signed membership request.
3232
placeholder: |
3333
-----BEGIN PGP SIGNED MESSAGE-----
3434
Hash: SHA512

.github/workflows/join.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check signature of join request
16-
id: gpg-check
16+
id: openpgp-check
1717
env:
1818
DATA: ${{ github.event.issue.body }}
1919
run: |
@@ -26,10 +26,10 @@ jobs:
2626
gpg --homedir mygpg --verify --status-fd 1 file.txt 2>/dev/null || true
2727
# 0: success
2828
# 2: no public key
29-
echo "extracting GPG key ID..."
29+
echo "extracting OpenPGP certificate ID..."
3030
key=$(gpg --homedir mygpg --verify --status-fd 1 file.txt 2>/dev/null | awk '{if ($2 == "ERRSIG") print $9; else if ($2 == "VALIDSIG") print $3}')
3131
echo "KEY: ${key}"
32-
echo "fetching GPG key from keyring.debian.org..."
32+
echo "fetching OpenPGP certificate from keyring.debian.org..."
3333
gpg --homedir mygpg --keyserver keyring.debian.org --recv-keys "$key"
3434
debuser=$(gpg --homedir mygpg -k ${key} | grep -E "^uid[[:space:]].*@debian.org>" | sed -e 's|.*<\([^@]*\)@debian.org>.*|\1|' | head -1)
3535
userid=$(gpg --homedir mygpg -k ${key} | grep -E "^uid[[:space:]].*\[" | sed -e 's|.*][[:space:]]*||' -e '/^[[:space:]]*$/d' | head -1)
@@ -40,8 +40,8 @@ jobs:
4040
echo "DEBUSER=${debuser}" >> $GITHUB_OUTPUT
4141
echo "USERID=${userid}" >> $GITHUB_OUTPUT
4242
outputs:
43-
deb-username: ${{ steps.gpg-check.outputs.DEBUSER }}
44-
pgp-userid: ${{ steps.gpg-check.outputs.USERID }}
43+
deb-username: ${{ steps.openpgp-check.outputs.DEBUSER }}
44+
pgp-userid: ${{ steps.openpgp-check.outputs.USERID }}
4545

4646
decline:
4747
name: Decline membership

0 commit comments

Comments
 (0)