summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-12-21 15:48:00 +0100
committerRuben Pollan <meskio@sindominio.net>2016-02-25 11:54:37 -0600
commit8e17fb43b4cbda9ee7b386d084e01fc99345f060 (patch)
treee151aafd25870845bd2d7756198b8a0ba6eea3d0
parentc68b9abc66b27a7dfd72d2806e1faf6ec16cd90f (diff)
[feat] use fingerprint instead of key_id to address keys
-rw-r--r--src/leap/bitmask/backend/components.py3
-rw-r--r--src/leap/bitmask/gui/advanced_key_management.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index e93ca19f..d8e4edbf 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -984,7 +984,8 @@ class Keymanager(object):
List all the keys stored in the local DB.
"""
def signal_details(public_key):
- details = (public_key.key_id, public_key.fingerprint)
+ # XXX: We should avoid the key-id
+ details = (public_key.fingerprint[-16:], public_key.fingerprint)
self._signaler.signal(self._signaler.keymanager_key_details,
details)
diff --git a/src/leap/bitmask/gui/advanced_key_management.py b/src/leap/bitmask/gui/advanced_key_management.py
index 2e315d18..bc496a57 100644
--- a/src/leap/bitmask/gui/advanced_key_management.py
+++ b/src/leap/bitmask/gui/advanced_key_management.py
@@ -94,6 +94,7 @@ class AdvancedKeyManagement(QtGui.QDialog):
"""
Set the current user's key details into the gui.
"""
+ # XXX: We should avoid the key-id
self.ui.leKeyID.setText(details[0])
self.ui.leFingerprint.setText(details[1])
@@ -246,7 +247,7 @@ class AdvancedKeyManagement(QtGui.QDialog):
row = keys_table.rowCount()
keys_table.insertRow(row)
keys_table.setItem(row, 0, QtGui.QTableWidgetItem(key.address))
- keys_table.setItem(row, 1, QtGui.QTableWidgetItem(key.key_id))
+ keys_table.setItem(row, 1, QtGui.QTableWidgetItem(key.fingerprint))
def _backend_connect(self):
"""