From 811a0e6eb8f67a4f97a3a6f610df146385fd5786 Mon Sep 17 00:00:00 2001
From: mengskysama <mengskysama@gmail.com>
Date: Tue, 12 Jan 2016 12:17:46 +0800
Subject: [PATCH] PEP8 and undefined name 'gen_key_iv'

---
 shadowsocks/udprelay.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/shadowsocks/udprelay.py b/shadowsocks/udprelay.py
index 975906e..3fbd9f3 100644
--- a/shadowsocks/udprelay.py
+++ b/shadowsocks/udprelay.py
@@ -164,7 +164,9 @@ class UDPRelay(object):
             else:
                 data = data[3:]
         else:
-            data, key, iv = encrypt.dencrypt_all(self._password, self._method, data)
+            data, key, iv = encrypt.dencrypt_all(self._password,
+                                                 self._method,
+                                                 data)
             # decrypt data
             if not data:
                 logging.debug(
@@ -221,11 +223,11 @@ class UDPRelay(object):
             self._eventloop.add(client, eventloop.POLL_IN, self)
 
         if self._is_local:
-            key, iv, m = gen_key_iv(self._password, self._method)
+            key, iv, m = encrypt.gen_key_iv(self._password, self._method)
             # spec https://shadowsocks.org/en/spec/one-time-auth.html
             if self._one_time_auth_enable:
                 data = self._ota_chunk_data_gen(key, iv, data)
-            data = encrypt.encrypt_all_m(key, iv, m, method, data)
+            data = encrypt.encrypt_all_m(key, iv, m, self._method, data)
             if not data:
                 return
         else: