summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-07-11 19:06:22 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-07-11 19:06:22 -0400
commitb9b3b0e547c2f8650838146c1f41b4b521fb7efc (patch)
tree71bdef31335f94a572175926ae3690ce6b345e1d /tests
parent0e288e3ce07ff84830aeaa414191666fad55db6b (diff)
update keytrans test to produce more reasonable output
Diffstat (limited to 'tests')
-rwxr-xr-xtests/keytrans27
1 files changed, 22 insertions, 5 deletions
diff --git a/tests/keytrans b/tests/keytrans
index bad2ae3..ab95f59 100755
--- a/tests/keytrans
+++ b/tests/keytrans
@@ -17,7 +17,8 @@ set -e
# piped commands should return the code of the first non-zero return
set -o pipefail
-export TESTDIR=$(dirname "$0")
+# make sure the TESTDIR is an absolute path, not a relative one.
+export TESTDIR=$(cd $(dirname "$0") && pwd)
source "$TESTDIR"/common
@@ -48,6 +49,14 @@ echo "##################################################"
echo "### generating openpgp key..."
export GNUPGHOME="$TEMPDIR"
chmod 700 "$TEMPDIR"
+
+
+# create the key with the same preferences that monkeysphere uses.
+cat > "$TEMPDIR"/gpg.conf <<EOF
+default-preference-list SHA512 SHA384 SHA256 SHA224 RIPEMD160 SHA1 ZLIB BZIP2 ZIP AES256 AES192 AES CAST5 3DES
+cert-digest-algo SHA256
+EOF
+
# generate a key
gpg --batch --$(get_gpg_prng_arg) --gen-key <<EOF
Key-Type: RSA
@@ -70,13 +79,21 @@ echo "### exporting key to ssh file..."
gpg --export-secret-key | openpgp2ssh > \
"$TEMPDIR"/test.pem
+gpg --export-secret-key > "$TEMPDIR"/secret.key
+
+PEM2OPENPGP_USAGE_FLAGS=sign,certify \
+PEM2OPENPGP_TIMESTAMP="$timestamp" pem2openpgp testtest \
+ < "$TEMPDIR"/test.pem > "$TEMPDIR"/converted.secret.key
+
echo "##################################################"
echo "### reconvert key, and compare to key in gpg keyring..."
diff -u \
- <(gpg --export-secret-key | hd) \
- <(PEM2OPENPGP_USAGE_FLAGS=sign,certify \
- PEM2OPENPGP_TIMESTAMP="$timestamp" pem2openpgp testtest < \
- "$TEMPDIR"/test.pem | hd )
+ <(gpg --list-packets < "$TEMPDIR"/secret.key) \
+ <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
+
+diff -u \
+ <(hd "$TEMPDIR"/secret.key) \
+ <(hd "$TEMPDIR"/converted.secret.key)
trap - EXIT