remove M2Crypto completely

.travis.yml

@@ -9,10 +9,10 @@ cache:
     - dante-1.4.0
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq build-essential libssl-dev swig python-m2crypto python-numpy dnsutils iproute nginx bc
+  - sudo apt-get install -qq build-essential dnsutils iproute nginx bc
   - sudo dd if=/dev/urandom of=/usr/share/nginx/www/file bs=1M count=10
   - sudo service nginx restart
-  - pip install m2crypto salsa20 pep8 pyflakes nose coverage
+  - pip install pep8 pyflakes nose coverage
   - sudo tests/socksify/install.sh
   - sudo tests/libsodium/install.sh
   - sudo tests/setup_tc.sh

shadowsocks/crypto/m2.py

@@ -1,119 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2014 clowwindy
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-from __future__ import absolute_import, division, print_function, \
-    with_statement
-
-import sys
-import logging
-
-__all__ = ['ciphers']
-
-has_m2 = True
-try:
-    __import__('M2Crypto')
-except ImportError:
-    has_m2 = False
-if bytes != str:
-    has_m2 = False
-
-
-def create_cipher(alg, key, iv, op, key_as_bytes=0, d=None, salt=None, i=1,
-                  padding=1):
-
-    import M2Crypto.EVP
-    return M2Crypto.EVP.Cipher(alg.replace('-', '_'), key, iv, op,
-                               key_as_bytes=0, d='md5', salt=None, i=1,
-                               padding=1)
-
-
-def err(alg, key, iv, op, key_as_bytes=0, d=None, salt=None, i=1, padding=1):
-    logging.error(('M2Crypto is required to use %s, please run'
-                   ' `apt-get install python-m2crypto`') % alg)
-    sys.exit(1)
-
-
-if has_m2:
-    ciphers = {
-        b'aes-128-cfb': (16, 16, create_cipher),
-        b'aes-192-cfb': (24, 16, create_cipher),
-        b'aes-256-cfb': (32, 16, create_cipher),
-        b'bf-cfb': (16, 8, create_cipher),
-        b'camellia-128-cfb': (16, 16, create_cipher),
-        b'camellia-192-cfb': (24, 16, create_cipher),
-        b'camellia-256-cfb': (32, 16, create_cipher),
-        b'cast5-cfb': (16, 8, create_cipher),
-        b'des-cfb': (8, 8, create_cipher),
-        b'idea-cfb': (16, 8, create_cipher),
-        b'rc2-cfb': (16, 8, create_cipher),
-        b'rc4': (16, 0, create_cipher),
-        b'seed-cfb': (16, 16, create_cipher),
-    }
-else:
-    ciphers = {}
-
-
-def run_method(method):
-    from shadowsocks.crypto import util
-
-    cipher = create_cipher(method, b'k' * 32, b'i' * 16, 1)
-    decipher = create_cipher(method, b'k' * 32, b'i' * 16, 0)
-
-    util.run_cipher(cipher, decipher)
-
-
-def check_env():
-    # skip this test on pypy and Python 3
-    try:
-        import __pypy__
-        del __pypy__
-        from nose.plugins.skip import SkipTest
-        raise SkipTest
-    except ImportError:
-        pass
-    if bytes != str:
-        from nose.plugins.skip import SkipTest
-        raise SkipTest
-
-
-def test_aes_128_cfb():
-    check_env()
-    run_method(b'aes-128-cfb')
-
-
-def test_aes_256_cfb():
-    check_env()
-    run_method(b'aes-256-cfb')
-
-
-def test_bf_cfb():
-    check_env()
-    run_method(b'bf-cfb')
-
-
-def test_rc4():
-    check_env()
-    run_method(b'rc4')
-
-
-if __name__ == '__main__':
-    test_aes_128_cfb()

shadowsocks/crypto/rc4_md5.py

@@ -25,6 +25,7 @@ from __future__ import absolute_import, division, print_function, \
 
 import hashlib
 
+from shadowsocks.crypto import openssl
 
 __all__ = ['ciphers']
 
@@ -35,15 +36,7 @@ def create_cipher(alg, key, iv, op, key_as_bytes=0, d=None, salt=None,
     md5.update(key)
     md5.update(iv)
     rc4_key = md5.digest()
-
-    try:
-        from shadowsocks.crypto import openssl
     return openssl.OpenSSLCrypto(b'rc4', rc4_key, b'', op)
-    except Exception:
-        import M2Crypto.EVP
-        return M2Crypto.EVP.Cipher(b'rc4', rc4_key, b'', op,
-                                   key_as_bytes=0, d='md5', salt=None, i=1,
-                                   padding=1)
 
 
 ciphers = {

shadowsocks/encrypt.py

@@ -28,23 +28,17 @@ import sys
 import hashlib
 import logging
 
-from shadowsocks.crypto import m2, rc4_md5, openssl, sodium, table
+from shadowsocks.crypto import rc4_md5, openssl, sodium, table
 
 
 method_supported = {}
 method_supported.update(rc4_md5.ciphers)
 method_supported.update(openssl.ciphers)
 method_supported.update(sodium.ciphers)
-# let M2Crypto override openssl
-method_supported.update(m2.ciphers)
 method_supported.update(table.ciphers)
 
 
 def random_string(length):
-    try:
-        import M2Crypto.Rand
-        return M2Crypto.Rand.rand_bytes(length)
-    except ImportError:
     return os.urandom(length)