From aeaee788f59a470526692d1fe5b6ff47169bbaeb Mon Sep 17 00:00:00 2001
From: project-repo <cagebreak_signing_key_12@project-repo.co>
Date: Wed, 3 Jan 2024 17:56:33 +0100
Subject: [PATCH] Update gpg-validity check.

---
 docs/dev-FAQ.md   |  7 ++++---
 test/gpg-validity | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/docs/dev-FAQ.md b/docs/dev-FAQ.md
index 8a6b3e9..d00e44c 100644
--- a/docs/dev-FAQ.md
+++ b/docs/dev-FAQ.md
@@ -41,11 +41,12 @@ run_target('create-sigs',
 
 Extrapolate from the examples in the `example_scripts` directory.
 
-The script should be executable with the .sh library file in the same directory.
+The script should be executable standalone. See `test/script-header` for a possible
+library.
 
 License, contributors etc. should be appropriate.
 
-Shellcheck must pass on any script (judicious use of shellcheck pragmas is allowed but
+Shellcheck must pass on any script (use of shellcheck pragmas is allowed but
 discouraged).
 
 ## How do I add a new gpg key?
@@ -60,6 +61,6 @@ discouraged).
 7. Sign the pkgbuild key with the new signing keys.
 8. Add public keys to `keys/`.
 9. Update meson_options.txt
-10. Update [all man pages](../manuals.md), [CONTRIBUTING](../CONTRIBUTING.md) & [SECURITY.md](../SECURITY.md)
+10. Update [all man pages](../manuals.md), [CONTRIBUTING](../CONTRIBUTING.md), gpg-validity test & [SECURITY.md](../SECURITY.md)
 11. Update the pkgbuild repo with the new key (key and readme).
 12. Securely distribute private keys and revocation certificates as per the internal wiki.
diff --git a/test/gpg-validity b/test/gpg-validity
index e051730..b20e16d 100644
--- a/test/gpg-validity
+++ b/test/gpg-validity
@@ -10,28 +10,28 @@ stoday=$(date +%s)
 signingmargin=90
 
 # shellcheck disable=2046
-skey11exptime=$(date --date=$(gpg --show-keys cagebreak_signing_key_11\@project-repo.co.pub | tail -2 | head -1 | cut -d " " -f 8 | rev | cut -c2- | rev) '+%s')
+skey13exptime=$(date --date=$(gpg --show-keys cagebreak_signing_key_13\@project-repo.co.pub | tail -2 | head -1 | cut -d " " -f 8 | rev | cut -c2- | rev) '+%s')
 # shellcheck disable=2046
-skey12exptime=$(date --date=$(gpg --show-keys cagebreak_signing_key_12\@project-repo.co.pub | tail -2 | head -1 | cut -d " " -f 8 | rev | cut -c2- | rev) '+%s')
+skey14exptime=$(date --date=$(gpg --show-keys cagebreak_signing_key_14\@project-repo.co.pub | tail -2 | head -1 | cut -d " " -f 8 | rev | cut -c2- | rev) '+%s')
 # shellcheck disable=2046
 mailexptime=$(date --date=$(gpg --show-keys cagebreak\@project-repo.co.pub | tail -2 | head -1 | cut -d " " -f 8 | rev | cut -c2- | rev) '+%s')
 
 # signing keys
-## signing key 11
-if [[ $(( (stoday - skey11exptime) / 86400 )) -lt $signingmargin ]]
+## signing key 13
+if [[ $(( (stoday - skey13exptime) / 86400 )) -lt $signingmargin ]]
 then
-    echo "[x] signign key 11"
+    echo "[x] signign key 13"
 else
     RESULT=1
-    echo "[ ] signing key 11"
+    echo "[ ] signing key 13"
 fi
-## signing key 12
-if [[ $(( (stoday - skey12exptime) / 86400 )) -lt $signingmargin ]]
+## signing key 14
+if [[ $(( (stoday - skey14exptime) / 86400 )) -lt $signingmargin ]]
 then
-    echo "[x] signign key 12"
+    echo "[x] signign key 14"
 else
     RESULT=1
-    echo "[ ] signing key 12"
+    echo "[ ] signing key 14"
 fi
 
 # email key