From c3e8b8890585d82bf19ac642756c5c4baac74237 Mon Sep 17 00:00:00 2001 From: Mark Adams Date: Sun, 14 Dec 2014 08:11:48 -0600 Subject: Made a couple of minor tweaks to clean up _read_next_string and _read_next_mpint --- src/cryptography/hazmat/primitives/serialization.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/primitives/serialization.py b/src/cryptography/hazmat/primitives/serialization.py index f20d9f56..455c8a91 100644 --- a/src/cryptography/hazmat/primitives/serialization.py +++ b/src/cryptography/hazmat/primitives/serialization.py @@ -65,8 +65,6 @@ def load_ssh_public_key(data, backend): def _load_ssh_rsa_public_key(key_type, key_body, backend): - assert key_type == b'ssh-rsa' - data = base64.b64decode(key_body) key_body_type, rest = _read_next_string(data) @@ -85,7 +83,7 @@ def _load_ssh_rsa_public_key(key_type, key_body, backend): def _read_next_string(data): """Retrieves the next RFC 4251 string value from the data.""" - str_len = struct.unpack('>I', data[0:4])[0] + str_len, = struct.unpack('>I', data[0:4]) return data[4:4 + str_len], data[4 + str_len:] -- cgit v1.2.3