Updated; full utf8 support and tests

Author: cipherboy

SSSA/sssa.py

@@ -1,4 +1,4 @@
-from utils import utils
+from SSSA.utils import utils
 
 class sssa:
     prime = 115792089237316195423570985008687907853269984665640564039457584007913129639747

SSSA/utils.py

@@ -22,21 +22,32 @@ def split_ints(self, secret):
             byte_object = bytes(secret, "utf8")
         except:
             byte_object = bytes(secret)
-        text = str(codecs.encode(byte_object, 'hex_codec').decode('utf8')) + "00"*(32 - (len(byte_object) % 32))
+        text = codecs.encode(byte_object, 'hex_codec').decode('utf8') + "00"*(32 - (len(byte_object) % 32))
 
-        for i in range(0, int(len(text)/32)):
-            result.append(int(text[i*32:(i+1)*32], 16))
+        for i in range(0, int(len(text)/64)):
+            result.append(int(text[i*64:(i+1)*64], 16))
 
         return result
 
     def merge_ints(self, secrets):
         result = ""
+
         for secret in secrets:
             hex_data = hex(secret)[2:].replace("L", "")
             hex_data = "0"*(len(hex_data) % 2) + hex_data
-            result += "00"*(32 - len(hex_data)) + hex_data
+            hex_data = "0"*(64 - (len(hex_data))) + hex_data
+            result += hex_data
+
+        byte_object = None
+        try:
+            byte_object = bytes(result, "utf8")
+
+            return codecs.decode(byte_object, 'hex_codec').decode('utf8').rstrip("\00\x00")
+        except:
+            byte_object = bytes(result)
 
-        return str(codecs.decode(result, 'hex_codec').decode('utf8')).rstrip("\00\x00")
+            return codecs.decode(byte_object, 'hex_codec').rstrip("\00\x00")
+        pass
 
     def evaluate_polynomial(self, coefficients, value):
         result = 0

SSSA/sssa_tests.py sssa_tests.pySSSA/sssa_tests.py renamed to sssa_tests.py

@@ -1,5 +1,5 @@
 import unittest
-from sssa import sssa
+from SSSA import sssa
 
 class TestStringMethods(unittest.TestCase):
     def test_create_combine(self):

SSSA/utils_tests.py utils_tests.pySSSA/utils_tests.py renamed to utils_tests.py

@@ -1,5 +1,7 @@
+# -*- coding: utf8 -*-
+
 import unittest
-from utils import utils
+from SSSA import utils
 
 class TestStringMethods(unittest.TestCase):
     def test_random(self):
@@ -25,6 +27,12 @@ def test_split_merge(self):
         for value in values:
             self.assertEqual(util.merge_ints(util.split_ints(value)), value)
 
+    def test_split_merge_odds(self):
+        util = utils()
+        values = ["a" + "\0"*100 + "a", "a"*31 + "哈囉世界", "こんにちは、世界"*32]
+        for value in values:
+            self.assertEqual(util.merge_ints(util.split_ints(value)), value)
+
     def test_mod_inverse(self):
         util = utils()
         for i in range(0, 10000):