From 7fbe42c07e7dae58477819d25b1d6b2b53367aa7 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 16 Jan 2008 16:41:06 +0100
Subject: * cmdline/apt-key:   - add support for a master-keyring that contains
 signing keys     that can be used to sign the archive signing keys. This
 should     make key-rollover easier.

---
 cmdline/apt-key | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'cmdline/apt-key')

diff --git a/cmdline/apt-key b/cmdline/apt-key
index c7db9a25a..d716a088f 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,9 +9,27 @@ GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-k
 GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
 
 
+MASTER_KEYRING=""
+#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg
 ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
 REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 
+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
+	add_keys=`$GPG_CMD --keyring $ARCHIVE_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
+	master_keys=`$GPG_CMD --keyring $MASTER_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
+	for add_key in $add_keys; do
+	    for master_key in $master_keys; do
+		if $GPG --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
+		    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export $add_key | $GPG --import
+		fi
+	    done
+	done
+}
 
 update() {
     if [ ! -f $ARCHIVE_KEYRING ]; then
@@ -20,10 +38,15 @@ update() {
 	exit 1
     fi
 
-    # add new keys
-    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
+    # 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
+    fi
 
-    # remove no-longer used keys
+    # remove no-longer supported/used keys
     keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
     for key in $keys; do
 	if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
@@ -32,6 +55,7 @@ update() {
     done
 }
 
+
 usage() {
     echo "Usage: apt-key [command] [arguments]"
     echo
-- 
cgit v1.2.3


From 8c56b1e0db5b29ccdc47b6f1664b1d0bd899a225 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 16 Jan 2008 16:48:13 +0100
Subject: cmdline/apt-key: refactor the master key checking into a function

---
 cmdline/apt-key | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'cmdline/apt-key')

diff --git a/cmdline/apt-key b/cmdline/apt-key
index d716a088f..048105320 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -15,20 +15,32 @@ ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
 REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 
 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
-	add_keys=`$GPG_CMD --keyring $ARCHIVE_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
-	master_keys=`$GPG_CMD --keyring $MASTER_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
-	for add_key in $add_keys; do
-	    for master_key in $master_keys; do
-		if $GPG --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
-		    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export $add_key | $GPG --import
-		fi
-	    done
+    ADD_KEYRING=$1
+    MASTER=$2
+    
+    if [ ! -f "$ADD_KEYRING" ]; then
+	echo "ERROR: '$ADD_KEYRING' not found"
+	return
+    fi 
+    if [ ! -f "$MASTER" ]; then
+	echo "ERROR: '$MASTER' not found"
+	return
+    fi
+
+    # 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
+    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
+	for master_key in $master_keys; do
+	    if $GPG --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
+		$GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export $add_key | $GPG --import
+	    fi
 	done
+    done
 }
 
 update() {
@@ -43,7 +55,7 @@ update() {
     if [ -z "$MASTER_KEYRING" ]; then
 	$GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
     else
-	add_keys_with_verify_against_master_keyring
+	add_keys_with_verify_against_master_keyring $ARCHIVE_KEYRING $MASTER_KEYRING
     fi
 
     # remove no-longer supported/used keys
-- 
cgit v1.2.3