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

fix openssl

Browse source
This commit is contained in:
clowwindy 2015-02-03 18:13:01 +08:00
parent 318d88ec89
commit 6d09cd21ca
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/crypto/openssl.py
View file

@ -20,6 +20,7 @@ from __future__ import absolute_import, division, print_function, \
from ctypes import c_char_p, c_int, c_long, byref,\ from ctypes import c_char_p, c_int, c_long, byref,\
create_string_buffer, c_void_p create_string_buffer, c_void_p
from shadowsocks import common
from shadowsocks.crypto import util from shadowsocks.crypto import util
__all__ = ['ciphers'] __all__ = ['ciphers']
@ -58,7 +59,7 @@ def load_openssl():
def load_cipher(cipher_name): def load_cipher(cipher_name):
func_name = b'EVP_' + cipher_name.replace(b'-', b'_') func_name = 'EVP_' + cipher_name.replace('-', '_')
if bytes != str: if bytes != str:
func_name = str(func_name, 'utf-8') func_name = str(func_name, 'utf-8')
cipher = getattr(libcrypto, func_name, None) cipher = getattr(libcrypto, func_name, None)
@ -73,6 +74,7 @@ class OpenSSLCrypto(object):
self._ctx = None self._ctx = None
if not loaded: if not loaded:
load_openssl() load_openssl()
cipher_name = common.to_bytes(cipher_name)
cipher = libcrypto.EVP_get_cipherbyname(cipher_name) cipher = libcrypto.EVP_get_cipherbyname(cipher_name)
if not cipher: if not cipher:
cipher = load_cipher(cipher_name) cipher = load_cipher(cipher_name)