Revert "Add card personalize 2 tests"

This reverts commit 0c46c1d25ce3c109bb8014914bd812a2a000f0ac.

tests/020_kdffull/02_personalization/test_051_adminfull_kdffull.py

@@ -21,4 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 from card_test_personalize_card_1 import *
-from card_test_personalize_card_2 import *

tests/card_test_1_import_keys.py

@@ -144,7 +144,7 @@ class Test_Card_Personalize_Card_2(object):
         assert v
 
     def test_setup_pw3_1(self, card):
-        r = card.change_passwd(3, FACTORY_PASSPHRASE_PW3, PW3_TEST1)
+        r = card.change_passwd(3, PW3_TEST0, PW3_TEST1)
         assert r
 
     def test_verify_pw3_1(self, card):
@@ -176,9 +176,9 @@ class Test_Card_Personalize_Card_2(object):
         assert v
 
     def test_setup_pw3_2(self, card):
-        r = card.change_passwd(3, PW3_TEST1, FACTORY_PASSPHRASE_PW3)
+        r = card.change_passwd(3, PW3_TEST1, PW3_TEST0)
         assert r
 
     def test_verify_pw3_2(self, card):
-        v = card.verify(3, FACTORY_PASSPHRASE_PW3)
+        v = card.verify(3, PW3_TEST0)
         assert v

tests/card_test_keygen.py

@@ -28,7 +28,7 @@ import pytest
 
 class Test_Card_Keygen(object):
     def test_verify_pw3_0(self, card):
-        v = card.verify(3, FACTORY_PASSPHRASE_PW3)
+        v = card.verify(3, PW3_TEST0)
         assert v
 
     def test_keygen_1(self, card):
@@ -66,9 +66,9 @@ class Test_Card_Keygen(object):
             pytest.skip("Gnuk resets passphrase on keygen, so, change passwd")
 
     def test_verify_pw1(self, card):
-        v = card.verify(1, FACTORY_PASSPHRASE_PW1)
+        v = card.verify(1, PW1_TEST4)
         assert v
 
     def test_verify_pw1_2(self, card):
-        v = card.verify(2, FACTORY_PASSPHRASE_PW1)
+        v = card.verify(2, PW1_TEST4)
         assert v

tests/card_test_personalize_card_2.py

@@ -202,23 +202,3 @@ class Test_Card_Personalize_Card_2(object):
     def test_verify_pw3_2(self, card):
         v = card.verify(3, PW3_TEST0)
         assert v
-
-    def test_setup_pw1_5(self, card):
-        r = card.change_passwd(1, PW1_TEST4, FACTORY_PASSPHRASE_PW1)
-        assert r
-
-    def test_verify_pw1_5(self, card):
-        v = card.verify(1, FACTORY_PASSPHRASE_PW1)
-        assert v
-
-    def test_verify_pw1_5_2(self, card):
-        v = card.verify(2, FACTORY_PASSPHRASE_PW1)
-        assert v
-
-    def test_setup_pw3_3(self, card):
-        r = card.change_passwd(3, PW3_TEST0, FACTORY_PASSPHRASE_PW3)
-        assert r
-
-    def test_verify_pw3_3(self, card):
-        v = card.verify(3, FACTORY_PASSPHRASE_PW3)
-        assert v

tests/card_test_personalize_reset.py

@@ -29,7 +29,7 @@ import pytest
 
 class Test_Personalize_Reset(object):
     def test_verify_pw3_0_test(self, card):
-        v = card.verify(3, FACTORY_PASSPHRASE_PW3)
+        v = card.verify(3, PW3_TEST0)
         assert v
 
     def test_login_put(self, card):
@@ -61,17 +61,17 @@ class Test_Personalize_Reset(object):
         r = card.cmd_put_data(0x00, 0xc4, b"\x00")
         assert r
 
-    #def test_setup_pw3_0(self, card):
-    #    r = card.change_passwd(3, PW3_TEST0, FACTORY_PASSPHRASE_PW3)
-    #    assert r
+    def test_setup_pw3_0(self, card):
+        r = card.change_passwd(3, PW3_TEST0, FACTORY_PASSPHRASE_PW3)
+        assert r
 
     def test_verify_pw3_0(self, card):
         v = card.verify(3, FACTORY_PASSPHRASE_PW3)
         assert v
 
-    #def test_setup_pw1_0(self, card):
-    #    r = card.change_passwd(1, PW1_TEST4, FACTORY_PASSPHRASE_PW1)
-    #    assert r
+    def test_setup_pw1_0(self, card):
+        r = card.change_passwd(1, PW1_TEST4, FACTORY_PASSPHRASE_PW1)
+        assert r
 
     def test_verify_pw1_0(self, card):
         v = card.verify(1, FACTORY_PASSPHRASE_PW1)

tests/card_test_public_key_operations.py

@@ -29,7 +29,7 @@ from constants_for_test import *
 
 class Test_Card_PK_OPs(object):
     def test_verify_pw3_0(self, card):
-        v = card.verify(3, FACTORY_PASSPHRASE_PW3)
+        v = card.verify(3, PW3_TEST0)
         assert v
 
     def test_sign_0(self, card):

tests/card_test_public_key_operations_kg.py

@@ -29,7 +29,7 @@ from constants_for_test import *
 
 class Test_Card_PK_OPs_KG(object):
     def test_verify_pw3_0(self, card):
-        v = card.verify(3, FACTORY_PASSPHRASE_PW3)
+        v = card.verify(3, PW3_TEST0)
         assert v
 
     def test_signature_sigkey(self, card):