vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rename test_cipher as it will break unit tests

Browse source
This commit is contained in:
clowwindy 2014-11-05 18:32:01 +08:00
parent 039451bcfb
commit 710fe14190
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/encrypt.py
View file

@ -51,7 +51,7 @@ def random_string(length):
cached_keys = {} cached_keys = {}
def test_cipher(key, method=None): def try_cipher(key, method=None):
Encryptor(key, method) Encryptor(key, method)

2
shadowsocks/local.py
View file

@ -46,7 +46,7 @@ def main():
utils.print_shadowsocks() utils.print_shadowsocks()
encrypt.test_cipher(config['password'], config['method']) encrypt.try_cipher(config['password'], config['method'])
try: try:
logging.info("starting local at %s:%d" % logging.info("starting local at %s:%d" %

2
shadowsocks/server.py
View file

@ -54,7 +54,7 @@ def main():
else: else:
config['port_password'][str(server_port)] = config['password'] config['port_password'][str(server_port)] = config['password']
encrypt.test_cipher(config['password'], config['method']) encrypt.try_cipher(config['password'], config['method'])
tcp_servers = [] tcp_servers = []
udp_servers = [] udp_servers = []
dns_resolver = asyncdns.DNSResolver() dns_resolver = asyncdns.DNSResolver()