diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-29 16:18:10 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-29 16:18:10 +0200 |
| commit | 15240f4b681ca35c669d2b2e6e34f8ee3f6c06d9 (patch) | |
| tree | 4139050e3c2f00650a0d316c971c4e7b8aba3e58 /cmdline/apt-key | |
| parent | 34904390bd6901f3de90249938baa0b875873534 (diff) | |
| parent | 1b8ba3ba050f01db27f1ddc0e5b280b2fccd9fb9 (diff) | |
merged with the debian-experimental-ma branch
Diffstat (limited to 'cmdline/apt-key')
| -rwxr-xr-x | cmdline/apt-key | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 73dfe6925..c5a2103d8 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -8,11 +8,14 @@ unset GREP_OPTIONS GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" GPG="$GPG_CMD" + +# ubuntu keyrings MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg + add_keys_with_verify_against_master_keyring() { ADD_KEYRING=$1 MASTER=$2 @@ -89,7 +92,7 @@ update() { # add new keys from the package; # we do not use add_keys_with_verify_against_master_keyring here, - # because we "update" is run on regular package updates. A + # because "update" is run on regular package updates. A # attacker might as well replace the master-archive-keyring file # in the package and add his own keys. so this check wouldn't # add any security. we *need* this check on net-update though @@ -143,6 +146,7 @@ if [ "$1" = "--keyring" ]; then else #echo "generate list" TRUSTEDFILE="/etc/apt/trusted.gpg" + eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring) if [ -r "$TRUSTEDFILE" ]; then GPG="$GPG --keyring $TRUSTEDFILE" fi |