diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2020-06-09 03:59:18 +0200 |
|---|---|---|
| committer | Andrew Gregory <andrew@archlinux.org> | 2020-06-18 11:07:14 +0200 |
| commit | 2a345604cd8bd6a8fe5041ea7ec046c8d20aa30b (patch) | |
| tree | deb276935c35d37643b0437554637e801735a843 /scripts/libmakepkg/integrity/generate_signature.sh.in | |
| parent | f4da297de252dcb00e6c83df00fea11c86606348 (diff) | |
| download | pacman-2a345604cd8bd6a8fe5041ea7ec046c8d20aa30b.tar.gz pacman-2a345604cd8bd6a8fe5041ea7ec046c8d20aa30b.tar.xz | |
makepkg/repo-add: handle GPGKEY with spaces
We pass this to gpg -u and this gpg option can accept a number of
different formats, not just the historical hexadecimal fingerprint we
assumed. We should not barf hard if a format is used which happens to
contain spaces.
This also fixes a validation bug. When we initially check if the desired
key is available, we don't quote spaces, so gpg goes ahead and treats
each space-separated string as a *different key* to search for,
returning partial matches, and returning success if at least one key is
found. But gpg --detach-sign -u will certainly not accept multiple keys!
Fixes FS#66949
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
(cherry picked from commit 899d39b635d46f9e2daff1aada75ea07f08fef64)
Diffstat (limited to 'scripts/libmakepkg/integrity/generate_signature.sh.in')
| -rw-r--r-- | scripts/libmakepkg/integrity/generate_signature.sh.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/libmakepkg/integrity/generate_signature.sh.in b/scripts/libmakepkg/integrity/generate_signature.sh.in index aec96c03..748087c2 100644 --- a/scripts/libmakepkg/integrity/generate_signature.sh.in +++ b/scripts/libmakepkg/integrity/generate_signature.sh.in @@ -29,12 +29,12 @@ create_signature() { local ret=0 local filename="$1" - local SIGNWITHKEY="" + local SIGNWITHKEY=() if [[ -n $GPGKEY ]]; then - SIGNWITHKEY="-u ${GPGKEY}" + SIGNWITHKEY=(-u "${GPGKEY}") fi - gpg --detach-sign --use-agent ${SIGNWITHKEY} --no-armor "$filename" &>/dev/null || ret=$? + gpg --detach-sign --use-agent "${SIGNWITHKEY[@]}" --no-armor "$filename" &>/dev/null || ret=$? if (( ! ret )); then |