From: W. Trevor King <wking@tremily.us>
Date: Fri, 20 Dec 2013 19:54:13 +0000 (-0800)
Subject: Add PGPPacket._str_generic_key_packet and fingerprint calculation
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc27b03c201aa70a3f41c22b8a7d05cbc2311ed7;p=gpg-migrate.git

Add PGPPacket._str_generic_key_packet and fingerprint calculation

From RFC 4880 [1]:

  A V4 fingerprint is the 160-bit SHA-1 hash of the octet 0x99,
  followed by the two-octet packet length, followed by the entire
  Public-Key packet starting with the version field.  The Key ID is
  the low-order 64 bits of the fingerprint.

Since all key types (public/private and primary/subkey) have the same
generic public key portion, we can use the same stringification method
for all types.

[1]: http://tools.ietf.org/search/rfc4880#section-12.2
---

diff --git a/gpg-migrate.py b/gpg-migrate.py
index 5b9ef10..a2519f8 100755
--- a/gpg-migrate.py
+++ b/gpg-migrate.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+import hashlib as _hashlib
 import re as _re
 import subprocess as _subprocess
 import struct as _struct
@@ -198,6 +199,21 @@ class PGPPacket (dict):
         details = method()
         return '{}: {}'.format(self['type'], details)
 
+    def _str_public_key_packet(self):
+        return self._str_generic_key_packet()
+
+    def _str_public_subkey_packet(self):
+        return self._str_generic_key_packet()
+
+    def _str_secret_key_packet(self):
+        return self._str_generic_key_packet()
+
+    def _str_secret_subkey_packet(self):
+        return self._str_generic_key_packet()
+
+    def _str_generic_key_packet(self):
+        return self['fingerprint'][-8:].upper()
+
     def _str_user_id_packet(self):
         return self['user']
 
@@ -337,6 +353,11 @@ class PGPPacket (dict):
             raise NotImplementedError(
                 'algorithm-specific key fields for {}'.format(
                     self['public-key-algorithm']))
+        fingerprint = _hashlib.sha1()
+        fingerprint.update(b'\x99')
+        fingerprint.update(_struct.pack('>H', len(data)))
+        fingerprint.update(data)
+        self['fingerprint'] = fingerprint.hexdigest()
         return offset
 
     def _parse_secret_key_packet(self, data):