From d8a5d9a1329d91688a9107fd8bdac738ebc58a22 Mon Sep 17 00:00:00 2001 From: mengskysama Date: Sun, 18 Feb 2018 23:21:20 +0800 Subject: [PATCH] update run_method() --- shadowsocks/crypto/mbedtls.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/shadowsocks/crypto/mbedtls.py b/shadowsocks/crypto/mbedtls.py index b87c2eb..cdfb8e1 100644 --- a/shadowsocks/crypto/mbedtls.py +++ b/shadowsocks/crypto/mbedtls.py @@ -408,22 +408,20 @@ ciphers = { def run_method(method): - from shadowsocks.crypto import openssl print(method, ': [stream]', 32) cipher = MbedTLSStreamCrypto(method, b'k' * 32, b'i' * 16, 1) - decipher = openssl.OpenSSLStreamCrypto(method, b'k' * 32, b'i' * 16, 0) + decipher = MbedTLSStreamCrypto(method, b'k' * 32, b'i' * 16, 0) util.run_cipher(cipher, decipher) def run_aead_method(method, key_len=16): - from shadowsocks.crypto import openssl print(method, ': [payload][tag]', key_len) key_len = int(key_len) cipher = MbedTLSAeadCrypto(method, b'k' * key_len, b'i' * key_len, 1) - decipher = openssl.OpenSSLAeadCrypto( + decipher = MbedTLSStreamCrypto( method, b'k' * key_len, b'i' * key_len, 0 ) @@ -432,12 +430,11 @@ def run_aead_method(method, key_len=16): def run_aead_method_chunk(method, key_len=16): - from shadowsocks.crypto import openssl print(method, ': chunk([size][tag][payload][tag]', key_len) key_len = int(key_len) cipher = MbedTLSAeadCrypto(method, b'k' * key_len, b'i' * key_len, 1) - decipher = openssl.OpenSSLAeadCrypto( + decipher = MbedTLSStreamCrypto( method, b'k' * key_len, b'i' * key_len, 0 )