From 7a983316550eb989183606b67e0773af7cef5a77 Mon Sep 17 00:00:00 2001
From: clowwindy <clowwindy42@gmail.com>
Date: Sun, 1 Jun 2014 17:35:32 +0800
Subject: [PATCH] add salsa20 test

---
 shadowsocks/encrypt_salsa20.py | 4 ++--
 test.py                        | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/shadowsocks/encrypt_salsa20.py b/shadowsocks/encrypt_salsa20.py
index d69010f..62bca65 100644
--- a/shadowsocks/encrypt_salsa20.py
+++ b/shadowsocks/encrypt_salsa20.py
@@ -109,7 +109,7 @@ def test():
     decipher = Salsa20Cipher('salsa20-ctr', 'k' * 32, 'i' * 8, 1)
     results = []
     pos = 0
-    print 'start'
+    print 'salsa20 test start'
     start = time.time()
     while pos < len(plain):
         l = random.randint(100, 32768)
@@ -124,7 +124,7 @@ def test():
         results.append(decipher.update(c[pos:pos + l]))
         pos += l
     end = time.time()
-    print BLOCK_SIZE * rounds / (end - start)
+    print 'speed: %d bytes/s' % (BLOCK_SIZE * rounds / (end - start))
     assert ''.join(results) == plain
 
 
diff --git a/test.py b/test.py
index 4da0a79..d1a5a0c 100755
--- a/test.py
+++ b/test.py
@@ -1,15 +1,17 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+import sys
+sys.path.insert(0, 'shadowsocks')
 import os
 import signal
-import sys
 import select
 import struct
 import hashlib
 import string
 import time
 from subprocess import Popen, PIPE
+import encrypt_salsa20
 
 target1 = [
     [60, 53, 84, 138, 217, 94, 88, 23, 39, 242, 219, 35, 12, 157, 165, 181, 255, 143, 83, 247, 162, 16, 31, 209, 190,
@@ -89,6 +91,8 @@ p2 = Popen(['python', 'shadowsocks/local.py', '-c', sys.argv[-1]], shell=False,
     stdout=PIPE, stderr=PIPE, close_fds=True)
 p3 = None
 
+encrypt_salsa20.test()
+
 print 'encryption test passed'
 
 try:
@@ -120,7 +124,7 @@ try:
         if r == 0:
             print 'test passed'
         sys.exit(r)
-    
+
 finally:
     for p in [p1, p2]:
         try: