re-enable nettle

Roguelazer · Jul 10, 2013 · 2b1e6eb · 2b1e6eb
1 parent e114d7a
commit 2b1e6eb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,5 +2,7 @@ language: python
 python:
     - "2.6"
     - "2.7"
-install: "pip install -r requirements.txt -r requirements-tests.txt --use-mirrors"
+install: 
+    - "apt-get install swig libnettle4"
+    - "pip install -r requirements.txt -r requirements-tests.txt --use-mirrors"
 script: "testify tests"
diff --git a/onepassword/_pbkdf2_nettle.py b/onepassword/_pbkdf2_nettle.py
@@ -13,7 +13,7 @@
 def _pbkdf2(password, salt, length, iterations, hash_size, set_fn, update_fn, digest_fn):
     buf = ctypes.create_string_buffer('', size=max(length, hash_size))
     # TODO: 1024 bytes is almost definitely not the size of this structure
-    shactx = ctypes.create_string_buffer('', size = 1024)
+    shactx = ctypes.create_string_buffer('', size=1024)
     set_fn(ctypes.byref(shactx), len(password), password)
     _nettle.nettle_pbkdf2(
         ctypes.byref(shactx),

diff --git a/tests/unit/pbkdf2_tests.py b/tests/unit/pbkdf2_tests.py
@@ -2,7 +2,7 @@
 
 from onepassword import _pbkdf2_pycrypto
 from onepassword import _pbkdf2_m2crypto
-#from onepassword import _pbkdf2_nettle
+from onepassword import _pbkdf2_nettle
 
 
 class PBKDF2SHA1TestCase(T.TestCase):
@@ -24,10 +24,10 @@ def test_vectors_m2crypto(self):
             generated = _pbkdf2_m2crypto.pbkdf2_sha1(password, salt, length=16, iterations=iterations)
             T.assert_equal(generated, expected_key)
 
-#    def test_vectors_nettle(self):
-#        for password, salt, iterations, expected_key in self.VECTORS:
-#            generated = _pbkdf2_nettle.pbkdf2_sha1(password, salt, length=16, iterations=iterations)
-#            T.assert_equal(generated, expected_key)
+    def test_vectors_nettle(self):
+        for password, salt, iterations, expected_key in self.VECTORS:
+            generated = _pbkdf2_nettle.pbkdf2_sha1(password, salt, length=16, iterations=iterations)
+            T.assert_equal(generated, expected_key)
 
 
 class PBKDF2SHA512TestCase(T.TestCase):
@@ -49,7 +49,7 @@ def test_vectors_m2crypto(self):
             generated = _pbkdf2_m2crypto.pbkdf2_sha512(password, salt, length=16, iterations=iterations)
             T.assert_equal(generated, expected_key)
 
-#    def test_vectors_nettle(self):
-#        for password, salt, iterations, expected_key in self.VECTORS:
-#            generated = _pbkdf2_nettle.pbkdf2_sha512(password, salt, length=16, iterations=iterations)
-#            T.assert_equal(generated, expected_key)
+    def test_vectors_nettle(self):
+        for password, salt, iterations, expected_key in self.VECTORS:
+            generated = _pbkdf2_nettle.pbkdf2_sha512(password, salt, length=16, iterations=iterations)
+            T.assert_equal(generated, expected_key)