diff --git a/etc/garasign_dist_file.sh b/etc/garasign_dist_file.sh index 3cc9d33a37..70746d6bbb 100755 --- a/etc/garasign_dist_file.sh +++ b/etc/garasign_dist_file.sh @@ -58,5 +58,7 @@ plugin_commands=( GNUPGHOME="$(mktemp -d)" export GNUPGHOME curl -sS https://pgp.mongodb.com/cpp-driver.pub | gpg -q --no-default-keyring --import - - gpgv "${dist_file_signed:?}" "${dist_file:?}" + gpg -q --import-ownertrust <<<"DC7F679B8A34DD606C1E54CAC4FC994D21532195:6:" # Set trust to "ultimate". + gpg -q --update-trustdb + gpg -q --verify "${dist_file_signed:?}" "${dist_file:?}" ) diff --git a/etc/garasign_release_tag.sh b/etc/garasign_release_tag.sh index c8e9cae9df..a84930df7d 100755 --- a/etc/garasign_release_tag.sh +++ b/etc/garasign_release_tag.sh @@ -48,8 +48,9 @@ git_tag_command=( "\"${release_tag:?}\"" ) plugin_commands="" -plugin_commands+="gpg --list-key DC7F679B8A34DD606C1E54CAC4FC994D21532195" -plugin_commands+="&& ${git_tag_command[*]:?}" +plugin_commands+="gpg -q --update-trustdb" +plugin_commands+=" && gpg --list-key DC7F679B8A34DD606C1E54CAC4FC994D21532195" +plugin_commands+=" && ${git_tag_command[*]:?}" "${launcher:?}" run \ --env-file="${garasign_creds:?}" \ -e "PLUGIN_COMMANDS=${plugin_commands:?}" \ @@ -63,5 +64,7 @@ plugin_commands+="&& ${git_tag_command[*]:?}" GNUPGHOME="$(mktemp -d)" export GNUPGHOME curl -sS https://pgp.mongodb.com/cpp-driver.pub | gpg -q --no-default-keyring --import - + gpg -q --import-ownertrust <<<"DC7F679B8A34DD606C1E54CAC4FC994D21532195:6:" # Set trust to "ultimate". + gpg -q --update-trustdb git verify-tag "${release_tag:?}" )