diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2016-05-25 17:23:42 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2016-05-25 17:25:50 +0200 |
| commit | 756159dc0f7715cac70b79d5a72fce190a380e58 (patch) | |
| tree | 6503976e20d2e8b5f15cefa3801aa1dc9c0ee7f4 /src/leap/keymanager/__init__.py | |
| parent | 8ebea34d6f7ec5a30b301b4f3e40fe89890464c6 (diff) | |
| parent | 50f7d3a976c3867a17bc3da9e9873fa179b43f82 (diff) | |
Merge remote-tracking branch 'pixelated/6200_add_support_for_binary_key' into develop
- Resolves: #6200
Diffstat (limited to 'src/leap/keymanager/__init__.py')
| -rw-r--r-- | src/leap/keymanager/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py index 1106c23..194a4ee 100644 --- a/src/leap/keymanager/__init__.py +++ b/src/leap/keymanager/__init__.py @@ -831,7 +831,7 @@ class KeyManager(object): self._assert_supported_key_type(ktype) _keys = self._wrapper_map[ktype] - pubkey, privkey = _keys.parse_ascii_key(key, address) + pubkey, privkey = _keys.parse_key(key, address) if pubkey is None: return defer.fail(KeyNotFound(key)) @@ -875,7 +875,7 @@ class KeyManager(object): ascii_content = yield self._get_with_combined_ca_bundle(uri) # XXX parse binary keys - pubkey, _ = _keys.parse_ascii_key(ascii_content, address) + pubkey, _ = _keys.parse_key(ascii_content, address) if pubkey is None: raise KeyNotFound(uri) |