* apt/auth.py:

  - support importing long keyids with leading 0x and mixed case

3 files changed, 7 insertions, 2 deletions

diff --git a/apt/auth.py b/apt/auth.py
index 742b5cc2..eff13b1a 100644
--- a/apt/auth.py
+++ b/apt/auth.py
@@ -175,7 +175,9 @@ def _add_key_from_keyserver(keyid, keyserver, tmp_keyring_dir):
             got_fingerprint = line.split(":")[9]
             # stop after the first to ensure no subkey trickery
             break
-    signing_key_fingerprint = keyid
+    # strip the leading "0x" is there is one and uppercase (as this is
+    # what gnupg is using)
+    signing_key_fingerprint = keyid.replace("0x", "").upper()
     if got_fingerprint != signing_key_fingerprint:
         raise AptKeyError(
             "Fingerprints do not match, not importing: '%s' != '%s'" % (
diff --git a/debian/changelog b/debian/changelog
index 37e1cbd1..60d78971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ python-apt (0.8.8) UNRELEASED; urgency=low
       man-in-the-middle attacks (LP: #1016643)
   * consolidate tests/test_lp1030278.py into the new 
     tests/test_size_to_str.py
+  * apt/auth.py:
+    - support importing long keyids with leading 0x and mixed case
 
   [ Barry Warsaw ]
   * python/string.cc, tests/test_lp1030278.py: Fix StrSizeToStr() so that
diff --git a/tests/test_auth.py b/tests/test_auth.py
index 4e37b3d3..d742a471 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -207,7 +207,8 @@ class TestAuthKeys(unittest.TestCase):
         self.addCleanup(self._stop_keyserver)
 
         apt.auth.add_key_from_keyserver(
-            "A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553", "hkp://localhost:19191")
+            "0xa1bD8E9D78F7FE5C3E65D8AF8B48AD6246925553", 
+            "hkp://localhost:19191")
 
         ret = apt.auth.list_keys()
         self.assertEqual(len(ret), 1)