projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0e288e3
)
update keytrans test to produce more reasonable output
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sat, 11 Jul 2009 23:06:22 +0000
(19:06 -0400)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sat, 11 Jul 2009 23:06:22 +0000
(19:06 -0400)
tests/keytrans
patch
|
blob
|
history
diff --git
a/tests/keytrans
b/tests/keytrans
index bad2ae3a15839f8dd27d2245f3bd2fcfce3ac178..ab95f596d91bfe70abf5608c8c054549e2edcb37 100755
(executable)
--- 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
# 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
source "$TESTDIR"/common
@@
-48,6
+49,14
@@
echo "##################################################"
echo "### generating openpgp key..."
export GNUPGHOME="$TEMPDIR"
chmod 700 "$TEMPDIR"
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
# 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 | 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 \
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
trap - EXIT