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

add salsa20 and chacha20

Browse source
This commit is contained in:
clowwindy 2014-12-10 23:19:11 +08:00
parent 9d33a59b60
commit e6416562fc
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/crypto/ctypes_libsodium.py
View file

@ -24,7 +24,7 @@ from __future__ import absolute_import, division, print_function, \
with_statement with_statement
import logging import logging
from ctypes import CDLL, c_char_p, c_int, c_long, c_ulonglong, byref, \ from ctypes import CDLL, c_char_p, c_int, c_ulonglong, byref, \
create_string_buffer, c_void_p create_string_buffer, c_void_p
__all__ = ['ciphers'] __all__ = ['ciphers']

4
shadowsocks/encrypt.py
View file

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