Rename decryption test cases to have more consistent names.
diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt index 5b0c351..037c307 100644 --- a/regress/CMakeLists.txt +++ b/regress/CMakeLists.txt
@@ -38,11 +38,11 @@ add_stored.test add_stored_in_memory.test count_entries.test - decrypt-aes-correct-password.test - decrypt-aes-no-password.test - decrypt-aes-wrong-password.test - decrypt-correct-password.test - decrypt-wrong-password.test + decrypt-correct-password-aes256.test + decrypt-correct-password-pkware.test + decrypt-no-password-aes256.test + decrypt-wrong-password-aes256.test + decrypt-wrong-password-pkware.test delete_add_same.test delete_invalid.test delete_last.test
diff --git a/regress/Makefile.am b/regress/Makefile.am index 6b9b011..01a13d7 100644 --- a/regress/Makefile.am +++ b/regress/Makefile.am
@@ -25,7 +25,7 @@ bogus.zip \ broken.zip \ cm-default.zip \ - encrypt-aes.zip \ + encrypt-aes256.zip \ encrypt.zip \ encrypt_plus_extra.zip \ encrypt_plus_extra_modified_c.zip \ @@ -150,11 +150,11 @@ add_stored_in_memory.test \ cm-default.test \ count_entries.test \ - decrypt-aes-correct-password.test \ - decrypt-aes-no-password.test \ - decrypt-aes-wrong-password.test \ - decrypt-correct-password.test \ - decrypt-wrong-password.test \ + decrypt-correct-password-aes256.test \ + decrypt-correct-password-pkware.test \ + decrypt-no-password-aes256.test \ + decrypt-wrong-password-aes256.test \ + decrypt-wrong-password-pkware.test \ delete_add_same.test \ delete_invalid.test \ delete_last.test \
diff --git a/regress/decrypt-aes-correct-password.test b/regress/decrypt-correct-password-aes256.test similarity index 70% rename from regress/decrypt-aes-correct-password.test rename to regress/decrypt-correct-password-aes256.test index a1b04c7..c485d58 100644 --- a/regress/decrypt-aes-correct-password.test +++ b/regress/decrypt-correct-password-aes256.test
@@ -1,5 +1,5 @@ # test AES decryption support, extract file using correct password return 0 args encrypt.zzip set_password foofoofoo cat 0 -file encrypt.zzip encrypt-aes.zip encrypt-aes.zip +file encrypt.zzip encrypt-aes256.zip encrypt-aes256.zip stdout foo
diff --git a/regress/decrypt-correct-password.test b/regress/decrypt-correct-password-pkware.test similarity index 100% rename from regress/decrypt-correct-password.test rename to regress/decrypt-correct-password-pkware.test
diff --git a/regress/decrypt-aes-no-password.test b/regress/decrypt-no-password-aes256.test similarity index 71% rename from regress/decrypt-aes-no-password.test rename to regress/decrypt-no-password-aes256.test index 4d8680c..f435ad3 100644 --- a/regress/decrypt-aes-no-password.test +++ b/regress/decrypt-no-password-aes256.test
@@ -1,5 +1,5 @@ # test AES decryption support, no password provided return 1 args encrypt.zzip cat 0 -file encrypt.zzip encrypt-aes.zip encrypt-aes.zip +file encrypt.zzip encrypt-aes256.zip encrypt-aes256.zip stderr can't open file at index '0': No password provided
diff --git a/regress/decrypt-aes-wrong-password.test b/regress/decrypt-wrong-password-aes256.test similarity index 76% rename from regress/decrypt-aes-wrong-password.test rename to regress/decrypt-wrong-password-aes256.test index 1e40465..4c327e9 100644 --- a/regress/decrypt-aes-wrong-password.test +++ b/regress/decrypt-wrong-password-aes256.test
@@ -1,5 +1,5 @@ # test AES decryption support, extract file using wrong password return 1 args encrypt.zzip set_password notfoonotfoo cat 0 -file encrypt.zzip encrypt-aes.zip encrypt-aes.zip +file encrypt.zzip encrypt-aes256.zip encrypt-aes256.zip stderr can't open file at index '0': Wrong password provided
diff --git a/regress/decrypt-wrong-password.test b/regress/decrypt-wrong-password-pkware.test similarity index 100% rename from regress/decrypt-wrong-password.test rename to regress/decrypt-wrong-password-pkware.test
diff --git a/regress/encrypt-aes.zip b/regress/encrypt-aes256.zip similarity index 100% rename from regress/encrypt-aes.zip rename to regress/encrypt-aes256.zip Binary files differ