File tree Expand file tree Collapse file tree 3 files changed +7
-10
lines changed Expand file tree Collapse file tree 3 files changed +7
-10
lines changed Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ def get_requirements():
1313
1414setup (
1515 name = 'ssh-crypt' ,
16- version = '1.1.11 ' ,
16+ version = '1.1.12 ' ,
1717 license = 'BSD' ,
1818 author = 'Maxim Nikitenko' ,
1919
Original file line number Diff line number Diff line change 11import os
2- import binascii
32from typing import Union , Optional
43
54from paramiko import Agent
@@ -49,14 +48,12 @@ def get_first_key():
4948
5049def find_filter_key (ssh_filter ):
5150 ssh_filter = ssh_filter .encode ()
52- filter_keys = []
51+
5352 for key in [key for key in get_keys () if key [0 ].name in VALID_SSH_NAME ]:
5453 if ssh_filter in key [1 ]:
55- filter_keys .append (key )
56- elif ssh_filter in binascii .hexlify (key [0 ].get_fingerprint (), sep = ":" ):
57- filter_keys .append (key )
58- if filter_keys :
59- return filter_keys [0 ][0 ]
54+ return key [0 ]
55+ elif ssh_filter .replace (b':' , b'' ) in key [0 ].get_fingerprint ().hex ().encode ():
56+ return key [0 ]
6057
6158
6259def choose_ssh_key (
Original file line number Diff line number Diff line change @@ -171,14 +171,14 @@ def test_decrypt_rsa(rsa_in_agent):
171171 with tempfile .NamedTemporaryFile () as file_obj_encryptor :
172172 with tempfile .NamedTemporaryFile ("r" ) as file_obj_decryptor :
173173 encryptor = Processor (
174- data_processor = encryptor ,
174+ data_processor = lambda : encryptor ,
175175 string_data = random_data ,
176176 output_file = file_obj_encryptor .name ,
177177 input_file = None ,
178178 )
179179 encryptor .run ()
180180 decryptor = Processor (
181- data_processor = decryptor ,
181+ data_processor = lambda : decryptor ,
182182 string_data = None ,
183183 output_file = file_obj_decryptor .name ,
184184 input_file = file_obj_encryptor .name ,
You can’t perform that action at this time.
0 commit comments