diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-03 23:52:47 +0100 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-03 23:52:47 +0100 |
| commit | e886575a26fdc686d8f47ae3f6e29d9b68de92fa (patch) | |
| tree | 83270be633909a1251c2004beafeb0b67df72a30 /tests | |
| parent | e0277f7e4598db6628cb378ba40bec8edb6f8672 (diff) | |
| parent | 1763b759fb47698a303b8b6d9e4eac83f25c1890 (diff) | |
| download | cryptography-e886575a26fdc686d8f47ae3f6e29d9b68de92fa.tar.gz cryptography-e886575a26fdc686d8f47ae3f6e29d9b68de92fa.tar.bz2 cryptography-e886575a26fdc686d8f47ae3f6e29d9b68de92fa.zip | |
Merge pull request #2200 from alex/ssh-spaces
Fixes #2199 -- allow SSH keys to have spaces in their comments
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/primitives/test_serialization.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index af605830..f82e7354 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -854,7 +854,7 @@ class TestRSASSHSerialization(object): with pytest.raises(ValueError): load_ssh_public_key(ssh_key, backend) - def test_load_ssh_public_key_rsa_extra_string_after_comment(self, backend): + def test_load_ssh_public_key_rsa_comment_with_spaces(self, backend): ssh_key = ( b"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDu/XRP1kyK6Cgt36gts9XAk" b"FiiuJLW6RU0j3KKVZSs1I7Z3UmU9/9aVh/rZV43WQG8jaR6kkcP4stOR0DEtll" @@ -866,8 +866,7 @@ class TestRSASSHSerialization(object): b"2MzHvnbv testkey@localhost extra" ) - with pytest.raises(ValueError): - load_ssh_public_key(ssh_key, backend) + load_ssh_public_key(ssh_key, backend) def test_load_ssh_public_key_rsa_extra_data_after_modulo(self, backend): ssh_key = ( @@ -943,7 +942,7 @@ class TestDSSSSHSerialization(object): with pytest.raises(ValueError): load_ssh_public_key(ssh_key, backend) - def test_load_ssh_public_key_dss_extra_string_after_comment(self, backend): + def test_load_ssh_public_key_dss_comment_with_spaces(self, backend): ssh_key = ( b"ssh-dss AAAAB3NzaC1kc3MAAACBALmwUtfwdjAUjU2Dixd5DvT0NDcjjr69UD" b"LqSD/Xt5Al7D3GXr1WOrWGpjO0NE9qzRCvMTU7zykRH6XjuNXB6Hvv48Zfm4vm" @@ -957,8 +956,7 @@ class TestDSSSSHSerialization(object): b"z53N7tPF/IhHTjBHb1Ol7IFu9p9A== testkey@localhost extra" ) - with pytest.raises(ValueError): - load_ssh_public_key(ssh_key, backend) + load_ssh_public_key(ssh_key, backend) def test_load_ssh_public_key_dss_extra_data_after_modulo(self, backend): ssh_key = ( |