diff --git a/ChangeLog b/ChangeLog index 81ffd8d..c2d323c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2013-10-23 Niibe Yutaka + + * test/features/010_setup_passphrase.feature + * test/features/030_key_registration.feature + * test/features/040_passphrase_change.feature + * test/features/410_setup_passphrase.feature + * test/features/430_key_registration.feature + * test/features/201_keygen.feature + * test/features/601_keygen.feature: Modified to support new way of + pass phrase reset by key import / key generation. + + * test/features/201_keygen.feature + * test/features/601_keygen.feature + * test/features/202_setup_passphrase.feature + * test/features/602_setup_passphrase.feature: Rename to change + order of execution. + 2013-10-23 Niibe Yutaka * src/openpgp-do.c (gpg_do_write_prvkey): Bug fix of adding diff --git a/test/features/010_setup_passphrase.feature b/test/features/010_setup_passphrase.feature index 1ddcc23..ae9b840 100644 --- a/test/features/010_setup_passphrase.feature +++ b/test/features/010_setup_passphrase.feature @@ -2,62 +2,10 @@ Feature: setup pass phrase In order to conform OpenPGP card 2.0 specification A token should support pass phrase: PW1, PW3 and reset code - Scenario: setup PW1 (admin-less mode) - Given cmd_change_reference_data with 1 and "123456user pass phrase" - Then it should get success - - Scenario: verify PW1 (1) - Given cmd_verify with 1 and "user pass phrase" - Then it should get success - - Scenario: verify PW1 (2) - Given cmd_verify with 2 and "user pass phrase" - Then it should get success - - Scenario: verify PW3 (admin-less mode) - Given cmd_verify with 3 and "user pass phrase" - Then it should get success - - Scenario: setup reset code (in admin-less mode) - Given cmd_put_data with d3 and "example reset code 000" - Then it should get success - - Scenario: reset pass phrase by reset code (in admin-less mode) - Given cmd_reset_retry_counter with 0 and "example reset code 000new user pass phrase" - Then it should get success - - Scenario: verify PW1 (1) again - Given cmd_verify with 1 and "new user pass phrase" - Then it should get success - - Scenario: verify PW1 (2) again - Given cmd_verify with 2 and "new user pass phrase" - Then it should get success - - Scenario: verify PW3 (admin-less mode) again - Given cmd_verify with 3 and "new user pass phrase" - Then it should get success - Scenario: setup PW3 (admin-full mode) - Given cmd_change_reference_data with 3 and "new user pass phraseadmin pass phrase" + Given cmd_change_reference_data with 3 and "12345678admin pass phrase" Then it should get success Scenario: verify PW3 (admin-full mode) Given cmd_verify with 3 and "admin pass phrase" Then it should get success - - Scenario: setup reset code (in admin-full mode) - Given cmd_put_data with d3 and "another reset code 000" - Then it should get success - - Scenario: reset pass phrase by reset code (in admin-full mode) - Given cmd_reset_retry_counter with 0 and "another reset code 000another user pass phrase" - Then it should get success - - Scenario: verify PW1 (1) again - Given cmd_verify with 1 and "another user pass phrase" - Then it should get success - - Scenario: verify PW1 (2) again - Given cmd_verify with 2 and "another user pass phrase" - Then it should get success diff --git a/test/features/030_key_registration.feature b/test/features/030_key_registration.feature index 4381307..305a5c1 100644 --- a/test/features/030_key_registration.feature +++ b/test/features/030_key_registration.feature @@ -47,6 +47,10 @@ Feature: import keys to token And put the data to d0 Then it should get success + Scenario: setup PW1 (admin-full mode) + Given cmd_change_reference_data with 1 and "123456another user pass phrase" + Then it should get success + Scenario: verify PW1 (1) again Given cmd_verify with 1 and "another user pass phrase" Then it should get success diff --git a/test/features/040_passphrase_change.feature b/test/features/040_passphrase_change.feature index 3aaf750..c0c1835 100644 --- a/test/features/040_passphrase_change.feature +++ b/test/features/040_passphrase_change.feature @@ -14,7 +14,7 @@ Feature: change pass phrase Given cmd_verify with 2 and "PASSPHRASE SHOULD BE LONG" Then it should get success - Scenario: setup reset code again (in admin-full mode) + Scenario: setup reset code (in admin-full mode) Given cmd_put_data with d3 and "example reset code 000" Then it should get success diff --git a/test/features/202_keygen.feature b/test/features/201_keygen.feature similarity index 54% rename from test/features/202_keygen.feature rename to test/features/201_keygen.feature index dcecf32..472ccde 100644 --- a/test/features/202_keygen.feature +++ b/test/features/201_keygen.feature @@ -20,18 +20,3 @@ Feature: key generation And put the first data to c9 And put the second data to d0 Then it should get success - - Scenario: compute digital signature by OPENPGP.1 key (1) - Given a message "GnuPG assumes that PW1 keeps valid after keygen." - And a public key from token for OPENPGP.1 - And let a token compute digital signature - And verify signature - Then it should get success - - Scenario: verify PW1 (1) after keygen - Given cmd_verify with 1 and "another user pass phrase" - Then it should get success - - Scenario: verify PW1 (2) after keygen - Given cmd_verify with 2 and "another user pass phrase" - Then it should get success diff --git a/test/features/201_setup_passphrase.feature b/test/features/202_setup_passphrase.feature similarity index 100% rename from test/features/201_setup_passphrase.feature rename to test/features/202_setup_passphrase.feature diff --git a/test/features/410_setup_passphrase.feature b/test/features/410_setup_passphrase.feature index 5ac2543..2e97ab4 100644 --- a/test/features/410_setup_passphrase.feature +++ b/test/features/410_setup_passphrase.feature @@ -2,54 +2,6 @@ Feature: setup pass phrase In order to conform OpenPGP card 2.0 specification A token should support pass phrase: PW1, PW3 and reset code - Scenario: setup PW1 (admin-less mode) - Given cmd_change_reference_data with 1 and "123456user pass phrase" - Then it should get success - - Scenario: verify PW1 (1) - Given cmd_verify with 1 and "user pass phrase" - Then it should get success - - Scenario: verify PW1 (2) - Given cmd_verify with 2 and "user pass phrase" - Then it should get success - Scenario: verify PW3 (admin-less mode) - Given cmd_verify with 3 and "user pass phrase" - Then it should get success - - Scenario: setup reset code (in admin-less mode) - Given cmd_put_data with d3 and "example reset code 000" - Then it should get success - - Scenario: reset pass phrase by reset code (in admin-less mode) - Given cmd_reset_retry_counter with 0 and "example reset code 000new user pass phrase" - Then it should get success - - Scenario: verify PW1 (1) again - Given cmd_verify with 1 and "new user pass phrase" - Then it should get success - - Scenario: verify PW1 (2) again - Given cmd_verify with 2 and "new user pass phrase" - Then it should get success - - Scenario: verify PW3 (admin-less mode) again - Given cmd_verify with 3 and "new user pass phrase" - Then it should get success - - Scenario: change PW1 - Given cmd_change_reference_data with 1 and "new user pass phraseanother user pass phrase" - Then it should get success - - Scenario: verify PW1 (1) again - Given cmd_verify with 1 and "another user pass phrase" - Then it should get success - - Scenario: verify PW1 (2) again - Given cmd_verify with 2 and "another user pass phrase" - Then it should get success - - Scenario: verify PW3 (admin-less mode) again - Given cmd_verify with 3 and "another user pass phrase" + Given cmd_verify with 3 and "12345678" Then it should get success diff --git a/test/features/430_key_registration.feature b/test/features/430_key_registration.feature index 4381307..95bab97 100644 --- a/test/features/430_key_registration.feature +++ b/test/features/430_key_registration.feature @@ -47,6 +47,10 @@ Feature: import keys to token And put the data to d0 Then it should get success + Scenario: setup PW1 (admin-less mode) + Given cmd_change_reference_data with 1 and "123456another user pass phrase" + Then it should get success + Scenario: verify PW1 (1) again Given cmd_verify with 1 and "another user pass phrase" Then it should get success diff --git a/test/features/602_keygen.feature b/test/features/601_keygen.feature similarity index 54% rename from test/features/602_keygen.feature rename to test/features/601_keygen.feature index dcecf32..472ccde 100644 --- a/test/features/602_keygen.feature +++ b/test/features/601_keygen.feature @@ -20,18 +20,3 @@ Feature: key generation And put the first data to c9 And put the second data to d0 Then it should get success - - Scenario: compute digital signature by OPENPGP.1 key (1) - Given a message "GnuPG assumes that PW1 keeps valid after keygen." - And a public key from token for OPENPGP.1 - And let a token compute digital signature - And verify signature - Then it should get success - - Scenario: verify PW1 (1) after keygen - Given cmd_verify with 1 and "another user pass phrase" - Then it should get success - - Scenario: verify PW1 (2) after keygen - Given cmd_verify with 2 and "another user pass phrase" - Then it should get success diff --git a/test/features/601_setup_passphrase.feature b/test/features/602_setup_passphrase.feature similarity index 100% rename from test/features/601_setup_passphrase.feature rename to test/features/602_setup_passphrase.feature