adapt crypto unit tests to run in main suite

diff --git a/runtests.py b/runtests.py
index d3787ba..2ebfe11 100755 (executable)
--- a/runtests.py
+++ b/runtests.py
@@ -19,6 +19,7 @@
 
 import unittest
 
+from testing.test_crypto import HeaderTest, AESGCMTest
 from testing.test_multivol import MultivolGnuFormatTest, MultivolPaxFormatTest
 from testing.test_concat_compress import ConcatCompressTest
 from testing.test_rescue_tar import RescueTarTest
@@ -53,6 +54,7 @@ if __name__ == "__main__":
                          , DeltaTarGzipStreamTest,   DeltaTarGzipConcatTest
                          , DeltaTarGzipAes128ConcatTest
                          , DeltaTarAes128ConcatTest
+                         , HeaderTest, AESGCMTest
                          ]:
                 try:
                     t = group (n)

diff --git a/testing/test_crypto.py b/testing/test_crypto.py
index c0d960b..4b4a016 100644 (file)
--- a/testing/test_crypto.py
+++ b/testing/test_crypto.py
@@ -102,10 +102,9 @@ class AESGCMTest (CryptoLayerTest):
         decryptor      = crypto.Decrypt (password, fixedparts=fixed)
         decryptor.next (header)
         plaintext      = decryptor.process (ciphertext)
-        ok, rest       = decryptor.done ()
+        rest           = decryptor.done ()
         plaintext     += rest
 
-        assert ok
         assert plaintext == TEST_PLAINTEXT
 
 
@@ -129,10 +128,10 @@ class AESGCMTest (CryptoLayerTest):
         decryptor      = crypto.Decrypt (password, fixedparts=fixed)
         decryptor.next (header)
         plaintext      = decryptor.process (ciphertext)
-        ok, err        = decryptor.done ()
-
-        assert ok is False
-        assert err == "InvalidTag()"
+        try:
+            _ = decryptor.done ()
+        except crypto.InvalidGCMTag:
+            pass
 
 
     def test_crypto_aes_gcm_enc_multicnk (self):
@@ -186,10 +185,8 @@ class AESGCMTest (CryptoLayerTest):
             pt += cnk
             off += cnksiz
 
-        ok, cnk = decryptor.done ()
-        assert ok
 
-        pt += cnk
+        pt += decryptor.done ()
         assert pt == orig_pt
 
 
@@ -229,9 +226,10 @@ class AESGCMTest (CryptoLayerTest):
             pt += cnk
             off += cnksiz
 
-        ok, err = decryptor.done ()
-        assert ok is False
-        assert err == "InvalidTag()"
+        try:
+            _ = decryptor.done ()
+        except crypto.InvalidGCMTag:
+            pass
 
 
 class HeaderTest (CryptoLayerTest):