Merge branch 'maint'
[gitweb.git] / t / lib-gpg.sh
index 4e57942b35ce74f88711dc0e16160e385da7e808..d88da29f77d23fe2f3efc86a15daf198dddbeb69 100755 (executable)
@@ -12,24 +12,39 @@ 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.
-               mkdir ./gpghome
-               chmod 0700 ./gpghome
-               GNUPGHOME="$(pwd)/gpghome"
-               export GNUPGHOME
-               gpg --homedir "${GNUPGHOME}" --import \
-                       "$TEST_DIRECTORY"/lib-gpg/pubring.gpg \
-                       "$TEST_DIRECTORY"/lib-gpg/secring.gpg
-               gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-                       "$TEST_DIRECTORY"/lib-gpg/ownertrust
+               # 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
+               # To export ownertrust:
+               #       gpg --homedir /tmp/gpghome --export-ownertrust \
+               #               > lib-gpg/ownertrust
+               mkdir ./gpghome &&
+               chmod 0700 ./gpghome &&
+               GNUPGHOME="$(pwd)/gpghome" &&
+               export GNUPGHOME &&
+               gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
+                       "$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+               gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \
+                       "$TEST_DIRECTORY"/lib-gpg/ownertrust &&
                test_set_prereq GPG
                ;;
        esac
 fi
 
+if test_have_prereq GPG &&
+    echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>&1
+then
+       test_set_prereq RFC1991
+fi
+
 sanitize_pgp() {
        perl -ne '
                /^-----END PGP/ and $in_pgp = 0;