diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-06 17:41:44 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-06 17:41:44 -0700 |
| commit | 431756bf12e39c4c7ea48755fd79d8b973e6d3a3 (patch) | |
| tree | 0a1cdb0d6079223e4ae6c55f62f795c0d70d47b5 /tests | |
| parent | bc0574e586fe29861ee069f05b9c4679c5c04c84 (diff) | |
Missed a merge conflict lolol
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_pkey.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/test_pkey.py b/tests/test_pkey.py index 74823728..6e589915 100644 --- a/tests/test_pkey.py +++ b/tests/test_pkey.py @@ -112,10 +112,7 @@ TEST_KEY_BYTESTR_2 = '\x00\x00\x00\x07ssh-rsa\x00\x00\x00\x01#\x00\x00\x00\x81\x TEST_KEY_BYTESTR_3 = '\x00\x00\x00\x07ssh-rsa\x00\x00\x00\x01#\x00\x00\x00\x00ӏV\x07k%<\x1fT$E#>ғfD\x18 \x0cae#̬S#VlE\x1epvo\x17M߉DUXL<\x06\x10דw\u2bd5ٿw˟0)#y{\x10l\tPru\t\x19Π\u070e/f0yFmm\x1f' -<<<<<<< HEAD class KeyTest(unittest.TestCase): -======= -class KeyTest (unittest.TestCase): def setUp(self): pass @@ -135,7 +132,6 @@ class KeyTest (unittest.TestCase): self.assertEqual(fh.readline()[:-1], "Proc-Type: 4,ENCRYPTED") self.assertEqual(fh.readline()[0:10], "DEK-Info: ") ->>>>>>> 2.1 def test_1_generate_key_bytes(self): key = util.generate_key_bytes(md5, x1234, 'happy birthday', 30) exp = b'\x61\xE1\xF2\x72\xF4\xC1\xC4\x56\x15\x86\xBD\x32\x24\x98\xC0\xE9\x24\x67\x27\x80\xF4\x7B\xB3\x7D\xDA\x7D\x54\x01\x9E\x64' |