formats: curve name should be a string

This commit is contained in:
Roman Zeyde
2016-05-05 22:28:06 +03:00
parent 4cbf8a9f0a
commit b2147a8418
4 changed files with 9 additions and 9 deletions

View File

@@ -29,7 +29,7 @@ class FakeConnection(object):
def get_public_node(self, n, ecdsa_curve_name=b'secp256k1'):
assert not self.closed
assert n == ADDR
assert ecdsa_curve_name in {b'secp256k1', b'nist256p1'}
assert ecdsa_curve_name in {'secp256k1', 'nist256p1'}
result = mock.Mock(spec=[])
result.node = mock.Mock(spec=[])
result.node.public_key = PUBKEY
@@ -91,7 +91,7 @@ def test_ssh_agent():
client.identity_to_string(ident))
assert challenge_hidden == BLOB
assert challenge_visual == 'VISUAL'
assert ecdsa_curve_name == b'nist256p1'
assert ecdsa_curve_name == 'nist256p1'
result = mock.Mock(spec=[])
result.public_key = PUBKEY

View File

@@ -29,7 +29,7 @@ def test_parse_public_key():
assert key['name'] == b'home'
assert key['point'] == _point
assert key['curve'] == b'nist256p1'
assert key['curve'] == 'nist256p1'
assert key['fingerprint'] == '4b:19:bc:0f:c8:7e:dc:fa:1a:e3:c2:ff:6f:e0:80:a2' # nopep8
assert key['type'] == b'ecdsa-sha2-nistp256'
@@ -46,7 +46,7 @@ def test_parse_ed25519():
'fSO8nLIi736is+f0erq28RTc7CkM11NZtTKR hello\n')
p = formats.import_public_key(pubkey)
assert p['name'] == b'hello'
assert p['curve'] == b'ed25519'
assert p['curve'] == 'ed25519'
BLOB = (b'\x00\x00\x00\x0bssh-ed25519\x00\x00\x00 P]\x17kc}#'
b'\xbc\x9c\xb2"\xef~\xa2\xb3\xe7\xf4z\xba\xb6\xf1\x14'