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

rename ctypes_* and remove salsa20-ctr

Browse source
This commit is contained in:
clowwindy 2015-01-12 14:05:20 +08:00
parent 3d03dbf716
commit e582b2b929
5 changed files with 41 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shadowsocks/encrypt.py
View file

@ -28,16 +28,14 @@ import sys
import hashlib
import logging
from shadowsocks.crypto import m2, rc4_md5, salsa20_ctr,\
ctypes_openssl, ctypes_libsodium, table
from shadowsocks.crypto import m2, rc4_md5, openssl, sodium, table
method_supported = {}
method_supported.update(rc4_md5.ciphers)
method_supported.update(salsa20_ctr.ciphers)
method_supported.update(ctypes_openssl.ciphers)
method_supported.update(ctypes_libsodium.ciphers)
# let M2Crypto override ctypes_openssl
method_supported.update(openssl.ciphers)
method_supported.update(sodium.ciphers)
# let M2Crypto override openssl
method_supported.update(m2.ciphers)
method_supported.update(table.ciphers)