From 9e0245075ca45ba059c4cdd3e2fa50ae60e7fd38 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 11 Oct 2016 20:17:49 -0400 Subject: move key files to generic names Gbp-Pq: Name 0013-move-key-files-to-generic-names.patch --- t/000_setup.t | 2 +- test/public_keys.pgp | Bin 0 -> 3418 bytes test/pubring.gpg | Bin 3418 -> 0 bytes test/secret_keys.pgp | Bin 0 -> 1241 bytes test/secring.gpg | Bin 1241 -> 0 bytes 5 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 test/public_keys.pgp delete mode 100644 test/pubring.gpg create mode 100644 test/secret_keys.pgp delete mode 100644 test/secring.gpg diff --git a/t/000_setup.t b/t/000_setup.t index 7f7f7b0..a8e3042 100644 --- a/t/000_setup.t +++ b/t/000_setup.t @@ -19,7 +19,7 @@ TEST copy('test/gpg.conf', 'test/gnupghome/gpg.conf'); reset_handles(); - my $pid = $gnupg->import_keys(command_args => [ 'test/pubring.gpg', 'test/secring.gpg' ], + my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp' ], options => [ 'batch'], handles => $handles); waitpid $pid, 0; diff --git a/test/public_keys.pgp b/test/public_keys.pgp new file mode 100644 index 0000000..60b008a Binary files /dev/null and b/test/public_keys.pgp differ diff --git a/test/pubring.gpg b/test/pubring.gpg deleted file mode 100644 index 60b008a..0000000 Binary files a/test/pubring.gpg and /dev/null differ diff --git a/test/secret_keys.pgp b/test/secret_keys.pgp new file mode 100644 index 0000000..aa34674 Binary files /dev/null and b/test/secret_keys.pgp differ diff --git a/test/secring.gpg b/test/secring.gpg deleted file mode 100644 index aa34674..0000000 Binary files a/test/secring.gpg and /dev/null differ -- cgit v1.2.3