projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b31b50d
)
fix some things in the keytrans test
author
Jameson Graef Rollins
<jrollins@finestructure.net>
Wed, 4 Feb 2009 06:42:40 +0000
(
01:42
-0500)
committer
Jameson Graef Rollins
<jrollins@finestructure.net>
Wed, 4 Feb 2009 06:42:40 +0000
(
01:42
-0500)
tests/keytrans
patch
|
blob
|
history
diff --git
a/tests/keytrans
b/tests/keytrans
index 262b6536b1306d7c31c4be73b1cf3a3a28c6671e..e1ccda599bbcdede8496660017c80793ab67b2a3 100755
(executable)
--- a/
tests/keytrans
+++ b/
tests/keytrans
@@
-40,21
+40,13
@@
mkdir -p "$TEMPDIR"
# Use the local copy of executables first, instead of system ones.
# This should help us test without installing.
# Use the local copy of executables first, instead of system ones.
# This should help us test without installing.
-export PATH="$TESTDIR"/../src:"$TESTDIR"/../src/keytrans:"$PATH"
-
-export MONKEYSPHERE_SYSDATADIR="$TEMPDIR"
-export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR"
-export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src/share
-export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami)
-export MONKEYSPHERE_CHECK_KEYSERVER=false
-export MONKEYSPHERE_LOG_LEVEL=DEBUG
-
+export PATH="$TESTDIR"/../src/keytrans:"$PATH"
######################################################################
### TEST KEYTRANS
echo "##################################################"
######################################################################
### TEST KEYTRANS
echo "##################################################"
-echo "###
test key conversion
..."
+echo "###
generating openpgp key
..."
export GNUPGHOME="$TEMPDIR"
chmod 700 "$TEMPDIR"
# generate a key
export GNUPGHOME="$TEMPDIR"
chmod 700 "$TEMPDIR"
# generate a key
@@
-68,19
+60,21
@@
Expire-Date: 0
%commit
%echo done
EOF
%commit
%echo done
EOF
-# get the the key timestamp
+
+echo "##################################################"
+echo "### retrieving key timestamp..."
timestamp=$(gpg --list-key --with-colons --fixed-list-mode | \
grep ^pub: | cut -d: -f6)
timestamp=$(gpg --list-key --with-colons --fixed-list-mode | \
grep ^pub: | cut -d: -f6)
-# export the key to a file
+
+echo "##################################################"
+echo "### exporting key to ssh file..."
gpg --export-secret-key | openpgp2ssh > \
"$TEMPDIR"/test.pem
gpg --export-secret-key | openpgp2ssh > \
"$TEMPDIR"/test.pem
-# reconvert key, and compare to key in gpg keyring
+
+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 )
diff -u \
<(gpg --export-secret-key | hd) \
<(PEM2OPENPGP_USAGE_FLAGS=sign,certify \
PEM2OPENPGP_TIMESTAMP="$timestamp" pem2openpgp testtest < \
"$TEMPDIR"/test.pem | hd )
-
-# clear out the temp dir
-rm -rf "$TEMPDIR"
-mkdir -p "$TEMPDIR"