Update gpg-validity check.

This commit is contained in:
project-repo 2024-01-03 17:56:33 +01:00
commit aeaee788f5
2 changed files with 14 additions and 13 deletions

View file

@ -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.

View file

@ -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