From 926d998a750413399ca7abbe422a65ccbf09306e Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Thu, 2 Oct 2014 13:00:55 -0400 Subject: Revert "makepkg: allow less than the full fingerprint in validpgpkeys" This reverts commit 50296576d006d433fbfd4a6c57d5f95a942f7833. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9d3ba2cd..f9494037 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1410,25 +1410,6 @@ parse_gpg_statusfile() { done < "$1" } -is_known_valid_pgp_key() { - local fprint subject=$1 validfprints=("${@:2}") - - for fprint in "${validfprints[@]}"; do - # we always honor full fingerprint matches - if [[ "$subject" = "$fprint" ]]; then - return 0 - fi - - # we'll also honor a suffix match, assuming that the fprint is long enough - # to be worthy. - if (( ${#fprint} >= 16 )) && [[ $subject = *"$fprint" ]]; then - return 0 - fi - done - - return 1 -} - check_pgpsigs() { (( SKIPPGPCHECK )) && return 0 ! source_has_signatures && return 0 @@ -1515,7 +1496,7 @@ check_pgpsigs() { if (( ${#validpgpkeys[@]} == 0 && ! $trusted )); then printf "%s ($(gettext "the public key %s is not trusted"))" $(gettext "FAILED") "$pubkey" >&2 errors=1 - elif ! is_known_valid_pgp_key "$fingerprint" "${validpgpkeys[@]}"; then + elif (( ${#validpgpkeys[@]} > 0 )) && ! in_array "$fingerprint" "${validpgpkeys[@]}"; then printf "%s (%s $pubkey)" "$(gettext "FAILED")" "$(gettext "invalid public key")" errors=1 else -- cgit v1.2.3-24-g4f1b