diff options
| author |  Christian Hesse <mail@eworm.de> | 2014-12-12 09:50:14 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-12-12 13:51:54 -0800 |
| commit | 1e3eefbc8d942f94d59d745bbfe91d28d39e680d (patch) | |
| tree | 4a94c5f2fd0e9c8dd4c3920b9f4828f988a3a016 /t/lib-gpg.sh | |
| parent | tests: skip RFC1991 tests for gnupg 2.1 (diff) | |
| download | tgif-1e3eefbc8d942f94d59d745bbfe91d28d39e680d.tar.xz | |
tests: replace binary GPG keyrings with ASCII-armored keys
Importing PGP key public and security ring works, but we do not have
all secret keys in one binary blob and all public keys in another.
Instead import public and secret keys for one key pair from a text
file that holds ASCII-armored export of them.
Signed-off-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-gpg.sh')
| -rwxr-xr-x | t/lib-gpg.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 7e077b01c1..b611b78f54 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -21,8 +21,7 @@ else GNUPGHOME="$(pwd)/gpghome" export GNUPGHOME gpg --homedir "${GNUPGHOME}" --import \ - "$TEST_DIRECTORY"/lib-gpg/pubring.gpg \ - "$TEST_DIRECTORY"/lib-gpg/secring.gpg + "$TEST_DIRECTORY"/lib-gpg/keyring.gpg gpg --homedir "${GNUPGHOME}" --import-ownertrust \ "$TEST_DIRECTORY"/lib-gpg/ownertrust test_set_prereq GPG |