From 53597500089549f412eeef11e0e262a4810deda4 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 13 Jun 2024 12:43:05 +0200 Subject: Check gpgv --dump-options for --assert-pubkey-algo support This avoids the fragile --help check. This option is not documented in the manual page but seems to be there. Thanks: Justus Winter for the idea --- cmdline/apt-key.in | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 07522723b..8738094b5 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -811,18 +811,8 @@ case "$command" in exit 29 fi GPGV_ARGS="" - if [ "$ASSERT_PUBKEY_ALGO" ]; then - test="$(LC_ALL=C.UTF-8 "$GPGV" --assert-pubkey-algo 2>&1 || :)" - case "$test" in - *"missing argument"*) - GPGV_ARGS="--assert-pubkey-algo=$ASSERT_PUBKEY_ALGO" - ;; - *[Ii]"nvalid option"*"assert-pubkey-algo"*) - ;; - *) - apt_warn "Unknown response from gpgv to --assert-pubkey-algo check: $test" - ;; - esac + if [ "$ASSERT_PUBKEY_ALGO" ] && $GPGV --dump-options | grep -q -- --assert-pubkey-algo; then + GPGV_ARGS="--assert-pubkey-algo=$ASSERT_PUBKEY_ALGO" fi # for a forced keyid we need gpg --export, so full wrapping required if [ -n "$FORCED_KEYID" ]; then -- cgit v1.2.3-70-g09d2