does not require M2Crypto anymore

2014-10-08 21:03:01 +08:00
parent 6609de4577
commit eb9b6f0a9b
5 changed files with 60 additions and 29 deletions
--- a/shadowsocks/encrypt.py
+++ b/shadowsocks/encrypt.py
@ -34,10 +34,11 @@ import crypto.ctypes_openssl

 method_supported = {}

-method_supported.update(crypto.m2.ciphers)
 method_supported.update(crypto.rc4_md5.ciphers)
 method_supported.update(crypto.salsa20_ctr.ciphers)
 method_supported.update(crypto.ctypes_openssl.ciphers)
+# let M2Crypto override ctypes_openssl
+method_supported.update(crypto.m2.ciphers)


 def random_string(length):