Simplify PRIVENCRYPT

This commit is contained in:
root 2013-02-23 18:38:54 +01:00
parent 6fb48d0eea
commit 367ced925b

View file

@ -288,16 +288,6 @@ CLEAN_FINAL()
fi fi
} }
addsignkeyparam()
{
if isnull "$Conf_signkey"; then
"$@"
else
"$@" -u "$Conf_signkey"
fi
}
ENCRYPT() ENCRYPT()
{ {
gpg --batch --force-mdc --compress-algo none --passphrase-fd 3 -c 3<<EOF gpg --batch --force-mdc --compress-algo none --passphrase-fd 3 -c 3<<EOF
@ -316,7 +306,11 @@ EOF
# Encrypt to recipients $1 # Encrypt to recipients $1
PRIVENCRYPT() PRIVENCRYPT()
{ {
addsignkeyparam gpg --compress-algo none -se $1 set -- $1
if isnonnull "$Conf_signkey"; then
set -- "$@" -u "$Conf_signkey"
fi
gpg --compress-algo none -se "$@"
} }
# $1 is the match for good signature, $2 is the textual signers list # $1 is the match for good signature, $2 is the textual signers list