summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-04-08 14:20:06 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2008-04-08 14:20:06 +0200
commit397d56f56b3ffaf38df57571c11f0699e2810902 (patch)
tree46a79cf1e74df9d9b2e0105198db8eca806f7c2f
parentc22356d86150dfee4903ff146a64cd5ad63be827 (diff)
* cmdline/apt-key:
- only check against master-keys in net-update to not break custom CDs (thanks to Colin Watson)
-rwxr-xr-xcmdline/apt-key20
-rw-r--r--debian/changelog8
2 files changed, 18 insertions, 10 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 77a2a4623..de04d16da 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -29,9 +29,8 @@ add_keys_with_verify_against_master_keyring() {
# when adding new keys, make sure that the archive-master-keyring
# is honored. so:
- # all keys that are exported and have the name
- # "Ubuntu Archive Automatic Signing Key" must have a valid signature
- # from a key in the ubuntu-master-keyring
+ # all keys that are exported must have a valid signature
+ # from a key in the $distro-master-keyring
add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5`
for add_key in $add_keys; do
@@ -81,13 +80,14 @@ update() {
exit 1
fi
- # add new keys, if no MASTER_KEYRING is used, use the traditional
- # way
- if [ -z "$MASTER_KEYRING" ]; then
- $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
- else
- add_keys_with_verify_against_master_keyring $ARCHIVE_KEYRING $MASTER_KEYRING
- fi
+ # 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
+ # 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
+ $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
# remove no-longer supported/used keys
keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
diff --git a/debian/changelog b/debian/changelog
index 6bc4d01ae..eaf33bf5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.7.9ubuntu16) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - only check against master-keys in net-update to not break
+ custom CDs (thanks to Colin Watson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 08 Apr 2008 14:17:14 +0200
+
apt (0.7.9ubuntu15) hardy; urgency=low
* cmdline/apt-get.cc: