Skip to content

Commit

Permalink
Switch to using gpgv for signature verification
Browse files Browse the repository at this point in the history
  • Loading branch information
watsonian committed Mar 1, 2024
1 parent 2522b47 commit 64095df
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/install.yml
Expand Up @@ -64,10 +64,10 @@ jobs:
- name: Uninstall gnupg
run: |
sudo apt-get remove -y gnupg;
sudo mv /usr/bin/gpg /usr/bin/gpg.old
sudo mv /usr/bin/gpgv /usr/bin/gpgv.old
- name: Verify gnupg has been removed
run: |
result=$(which gpg) || true;
result=$(which gpgv) || true;
if [ -n "$result" ]; then
exit 1;
fi;
Expand Down
8 changes: 4 additions & 4 deletions scripts/install.sh
Expand Up @@ -391,9 +391,9 @@ fi

log_debug "Detected format '$format'"

gpg_binary="$(command -v gpg || true)";
if [ -x "$gpg_binary" ]; then
log_debug "Using $gpg_binary for signature verification"
gpgv_binary="$(command -v gpgv || true)";
if [ -x "$gpgv_binary" ]; then
log_debug "Using $gpgv_binary for signature verification"
else
log "ERROR: Unable to find gpg binary for signature verification"
log "You can resolve this error by installing your system's gnupg package"
Expand Down Expand Up @@ -474,7 +474,7 @@ if [ -d ~/.gnupg ]; then
# Run sudo chown -r $(whoami) ~/.gnupg to fix this
ls -l ~/.gnupg > /dev/null 2>&1 || (log "Failed to read ~/.gnupg. Please verify the directory's ownership, or run 'sudo chown -R $(whoami) ~/.gnupg' to fix this." && clean_exit 4)
fi
gpg --no-default-keyring --keyring "$key_filename" --verify "$sig_filename" "$filename" > /dev/null 2>&1 || (log "Failed to verify binary signature" && clean_exit 1)
gpgv --keyring "$key_filename" "$sig_filename" "$filename" > /dev/null 2>&1 || (log "Failed to verify binary signature" && clean_exit 1)
log_debug "Signature successfully verified!"

if [ "$format" = "deb" ]; then
Expand Down

0 comments on commit 64095df

Please sign in to comment.