update run_method() (#1161)
This commit is contained in:
parent
2ab8c6bf5d
commit
8b302646ed
|
@ -408,22 +408,20 @@ ciphers = {
|
||||||
|
|
||||||
|
|
||||||
def run_method(method):
|
def run_method(method):
|
||||||
from shadowsocks.crypto import openssl
|
|
||||||
|
|
||||||
print(method, ': [stream]', 32)
|
print(method, ': [stream]', 32)
|
||||||
cipher = MbedTLSStreamCrypto(method, b'k' * 32, b'i' * 16, 1)
|
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)
|
util.run_cipher(cipher, decipher)
|
||||||
|
|
||||||
|
|
||||||
def run_aead_method(method, key_len=16):
|
def run_aead_method(method, key_len=16):
|
||||||
from shadowsocks.crypto import openssl
|
|
||||||
|
|
||||||
print(method, ': [payload][tag]', key_len)
|
print(method, ': [payload][tag]', key_len)
|
||||||
key_len = int(key_len)
|
key_len = int(key_len)
|
||||||
cipher = MbedTLSAeadCrypto(method, b'k' * key_len, b'i' * key_len, 1)
|
cipher = MbedTLSAeadCrypto(method, b'k' * key_len, b'i' * key_len, 1)
|
||||||
decipher = openssl.OpenSSLAeadCrypto(
|
decipher = MbedTLSAeadCrypto(
|
||||||
method,
|
method,
|
||||||
b'k' * key_len, b'i' * key_len, 0
|
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):
|
def run_aead_method_chunk(method, key_len=16):
|
||||||
from shadowsocks.crypto import openssl
|
|
||||||
|
|
||||||
print(method, ': chunk([size][tag][payload][tag]', key_len)
|
print(method, ': chunk([size][tag][payload][tag]', key_len)
|
||||||
key_len = int(key_len)
|
key_len = int(key_len)
|
||||||
cipher = MbedTLSAeadCrypto(method, b'k' * key_len, b'i' * key_len, 1)
|
cipher = MbedTLSAeadCrypto(method, b'k' * key_len, b'i' * key_len, 1)
|
||||||
decipher = openssl.OpenSSLAeadCrypto(
|
decipher = MbedTLSAeadCrypto(
|
||||||
method,
|
method,
|
||||||
b'k' * key_len, b'i' * key_len, 0
|
b'k' * key_len, b'i' * key_len, 0
|
||||||
)
|
)
|
||||||
|
|
|
@ -346,6 +346,8 @@ def run_method(method):
|
||||||
|
|
||||||
def run_aead_method(method, key_len=16):
|
def run_aead_method(method, key_len=16):
|
||||||
|
|
||||||
|
if not loaded:
|
||||||
|
load_openssl(None)
|
||||||
print(method, ': [payload][tag]', key_len)
|
print(method, ': [payload][tag]', key_len)
|
||||||
cipher = libcrypto.EVP_get_cipherbyname(common.to_bytes(method))
|
cipher = libcrypto.EVP_get_cipherbyname(common.to_bytes(method))
|
||||||
if not cipher:
|
if not cipher:
|
||||||
|
@ -362,6 +364,8 @@ def run_aead_method(method, key_len=16):
|
||||||
|
|
||||||
def run_aead_method_chunk(method, key_len=16):
|
def run_aead_method_chunk(method, key_len=16):
|
||||||
|
|
||||||
|
if not loaded:
|
||||||
|
load_openssl(None)
|
||||||
print(method, ': chunk([size][tag][payload][tag]', key_len)
|
print(method, ': chunk([size][tag][payload][tag]', key_len)
|
||||||
cipher = libcrypto.EVP_get_cipherbyname(common.to_bytes(method))
|
cipher = libcrypto.EVP_get_cipherbyname(common.to_bytes(method))
|
||||||
if not cipher:
|
if not cipher:
|
||||||
|
|
|
@ -10,3 +10,10 @@ pushd openssl-$OPENSSL_VER
|
||||||
# sudo ldconfig # test multiple libcrypto
|
# sudo ldconfig # test multiple libcrypto
|
||||||
popd
|
popd
|
||||||
rm -rf openssl-$OPENSSL_VER || exit 1
|
rm -rf openssl-$OPENSSL_VER || exit 1
|
||||||
|
|
||||||
|
rm /usr/bin/openssl || exit 1
|
||||||
|
rm -r /usr/include/openssl || exit 1
|
||||||
|
ln -s /usr/local/bin/openssl /usr/bin/openssl || exit 1
|
||||||
|
ln -s /usr/local/include/openssl /usr/include/openssl || exit 1
|
||||||
|
echo /usr/local/lib >> /etc/ld.so.conf || exit 1
|
||||||
|
ldconfig -v || exit 1
|
||||||
|
|
Loading…
Reference in New Issue