Merge branch 'tc/missing-http-proxyauth'

diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 33de4020f6d9975eb7a447656623a15123d92ecd..db2ef22e8f76a54c851424dd19c1232f6061392c 100755 (executable)
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -12,10 +12,22 @@ else
                say "Your version of gpg (1.0.6) is too buggy for testing"
                ;;
        *)
-               # key generation info: gpg --homedir t/lib-gpg --gen-key
-               # Type DSA and Elgamal, size 2048 bits, no expiration date.
-               # Name and email: C O Mitter <committer@example.com>
+               # Available key info:
+               # * Type DSA and Elgamal, size 2048 bits, no expiration date,
+               #   name and email: C O Mitter <committer@example.com>
+               # * Type RSA, size 2048 bits, no expiration date,
+               #   name and email: Eris Discordia <discord@example.net>
                # No password given, to enable non-interactive operation.
+               # To generate new key:
+               #       gpg --homedir /tmp/gpghome --gen-key
+               # To write armored exported key to keyring:
+               #       gpg --homedir /tmp/gpghome --export-secret-keys \
+               #               --armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+               #       gpg --homedir /tmp/gpghome --export \
+               #               --armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+               # To export ownertrust:
+               #       gpg --homedir /tmp/gpghome --export-ownertrust \
+               #               > lib-gpg/ownertrust
                mkdir ./gpghome &&
                chmod 0700 ./gpghome &&
                GNUPGHOME="$(pwd)/gpghome" &&
@@ -24,6 +36,8 @@ else
                        "$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
                gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \
                        "$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+               gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null 2>&1 \
+                       --sign -u committer@example.com &&
                test_set_prereq GPG
                ;;
        esac