summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2014-09-16 11:27:40 -0500
committerRuben Pollan <meskio@sindominio.net>2014-09-16 12:57:42 -0500
commit6053b7f6689a4a168c2b394db456bb8c72e516f7 (patch)
treee648113b4e6fa157451404abd5bba88d916918e1
parentac0432fd35d5325110c96db065ef6eb6257a8d31 (diff)
Remove parse_openpgp_ascii_key
Don't fit with the logic of the keymanager and it's not use except for some commented code in bitmask_client
-rw-r--r--keymanager/src/leap/keymanager/__init__.py14
1 files changed, 0 insertions, 14 deletions
diff --git a/keymanager/src/leap/keymanager/__init__.py b/keymanager/src/leap/keymanager/__init__.py
index 3888c0ad..bd85c2d4 100644
--- a/keymanager/src/leap/keymanager/__init__.py
+++ b/keymanager/src/leap/keymanager/__init__.py
@@ -495,20 +495,6 @@ class KeyManager(object):
return self._wrapper_map[pubkey.__class__].verify(
data, pubkey, detached_sig=detached_sig)
- def parse_openpgp_ascii_key(self, key_data):
- """
- Parses an ascii armored key (or key pair) data and returns
- the OpenPGPKey keys.
-
- :param key_data: the key data to be parsed.
- :type key_data: str or unicode
-
- :returns: the public key and private key (if applies) for that data.
- :rtype: (public, private) -> tuple(OpenPGPKey, OpenPGPKey)
- the tuple may have one or both components None
- """
- return self._wrapper_map[OpenPGPKey].parse_ascii_key(key_data)
-
def delete_key(self, key):
"""
Remove C{key} from storage.