#775 fix UDP decrypt_all issue

shadowsocks/crypto/openssl.py

@@ -22,7 +22,8 @@ from ctypes import c_char_p, c_int, c_long, byref,\
 
 from shadowsocks import common
 from shadowsocks.crypto import util
-from shadowsocks.crypto.aead import *
+from shadowsocks.crypto.aead import AeadCryptoBase, EVP_CTRL_AEAD_SET_IVLEN, \
+    nonce_increment, EVP_CTRL_AEAD_GET_TAG, EVP_CTRL_AEAD_SET_TAG
 
 __all__ = ['ciphers']
 
@@ -117,7 +118,8 @@ class OpenSSLCryptoBase(object):
             buf = create_string_buffer(buf_size)
         libcrypto.EVP_CipherUpdate(
             self._ctx, byref(buf),
-                byref(cipher_out_len), c_char_p(data), l)
+            byref(cipher_out_len), c_char_p(data), l
+        )
         # buf is copied to a str object when we access buf.raw
         return buf.raw[:cipher_out_len.value]
 
@@ -141,7 +143,8 @@ class OpenSSLAeadCrypto(OpenSSLCryptoBase, AeadCryptoBase):
         r = libcrypto.EVP_CipherInit_ex(
             self._ctx,
             self._cipher, None,
-                None, None, c_int(op))
+            None, None, c_int(op)
+        )
         if not r:
             self.clean()
             raise Exception('can not initialize cipher context')
@@ -149,7 +152,9 @@ class OpenSSLAeadCrypto(OpenSSLCryptoBase, AeadCryptoBase):
         r = libcrypto.EVP_CIPHER_CTX_ctrl(
             self._ctx,
             c_int(EVP_CTRL_AEAD_SET_IVLEN),
-                c_int(self._nlen), None)
+            c_int(self._nlen),
+            None
+        )
         if not r:
             raise Exception('Set ivlen failed')
 

shadowsocks/crypto/sodium.py

@@ -21,7 +21,7 @@ from ctypes import c_char_p, c_int, c_ulonglong, byref, c_ulong, \
     create_string_buffer, c_void_p
 
 from shadowsocks.crypto import util
-from shadowsocks.crypto.aead import *
+from shadowsocks.crypto.aead import AeadCryptoBase
 
 __all__ = ['ciphers']
 

shadowsocks/crypto/util.py

@@ -19,7 +19,6 @@ from __future__ import absolute_import, division, print_function, \
 
 import os
 import logging
-from ctypes import create_string_buffer
 
 
 def find_library_nt(name):
@@ -34,7 +33,7 @@ def find_library_nt(name):
             results.append(fname)
         if fname.lower().endswith(".dll"):
             continue
-        fname = fname + ".dll"
+        fname += ".dll"
         if os.path.isfile(fname):
             results.append(fname)
     return results
@@ -111,9 +110,9 @@ def run_cipher(cipher, decipher):
     import random
     import time
 
-    BLOCK_SIZE = 16384
+    block_size = 16384
     rounds = 1 * 1024
-    plain = urandom(BLOCK_SIZE * rounds)
+    plain = urandom(block_size * rounds)
 
     results = []
     pos = 0
@@ -132,7 +131,7 @@ def run_cipher(cipher, decipher):
         results.append(decipher.decrypt(c[pos:pos + l]))
         pos += l
     end = time.time()
-    print('speed: %d bytes/s' % (BLOCK_SIZE * rounds / (end - start)))
+    print('speed: %d bytes/s' % (block_size * rounds / (end - start)))
     assert b''.join(results) == plain