Commit 8bd76a0f authored by Niels Möller's avatar Niels Möller

* src/testsuite/keygen-1-test: Pass -c none to lsh-writekey.

* src/testsuite/keygen-2-test: Likewise.
* src/testsuite/lsh-decrypt-key-test: Likewise.
* src/testsuite/setup-env: Likewise.
* src/testsuite/write-key-1-test: Likewise.
* src/testsuite/write-key-2-test: Likewise.

Rev: src/testsuite/keygen-1-test:1.4
Rev: src/testsuite/keygen-2-test:1.8
Rev: src/testsuite/lsh-decrypt-key-test:1.3
Rev: src/testsuite/setup-env:1.2
Rev: src/testsuite/write-key-1-test:1.2
Rev: src/testsuite/write-key-2-test:1.3
parent 240d6908
...@@ -11,5 +11,5 @@ fi ...@@ -11,5 +11,5 @@ fi
. $srcdir/functions.sh . $srcdir/functions.sh
rm -f foo foo.pub rm -f foo foo.pub
../lsh-keygen -a dsa -l2 | ../lsh-writekey -o foo \ ../lsh-keygen -a dsa -l2 | ../lsh-writekey -c none -o foo \
&& "$SEXP_CONV" < foo && [ -s foo -a -s foo.pub ] && test_success && "$SEXP_CONV" < foo && [ -s foo -a -s foo.pub ] && test_success
...@@ -11,5 +11,5 @@ fi ...@@ -11,5 +11,5 @@ fi
. $srcdir/functions.sh . $srcdir/functions.sh
rm -f foo foo.pub rm -f foo foo.pub
../lsh-keygen -a rsa -l 777 | ../lsh-writekey -o foo \ ../lsh-keygen -a rsa -l 777 | ../lsh-writekey -c none -o foo \
&& "$SEXP_CONV" < foo && [ -s foo -a -s foo.pub ] && test_success && "$SEXP_CONV" < foo && [ -s foo -a -s foo.pub ] && test_success
...@@ -26,7 +26,7 @@ chmod u+rx $fname ...@@ -26,7 +26,7 @@ chmod u+rx $fname
../lsh-keygen > $keyname.origkey ../lsh-keygen > $keyname.origkey
../lsh-writekey -o $keyname -caes256-cbc -pbar <$keyname.origkey || test_fail ../lsh-writekey -o $keyname -caes256-cbc -pbar <$keyname.origkey || test_fail
../lsh-writekey -o $keyname.nevercrypted <$keyname.origkey || test_fail ../lsh-writekey -o $keyname.nevercrypted -c none <$keyname.origkey || test_fail
../lsh-decrypt-key --in=$keyname --out=$keyname.decrypted --askpass=$fname || test_fail ../lsh-decrypt-key --in=$keyname --out=$keyname.decrypted --askpass=$fname || test_fail
......
...@@ -17,7 +17,7 @@ echo "Creating seed file" ...@@ -17,7 +17,7 @@ echo "Creating seed file"
../lsh-make-seed -q --sloppy ../lsh-make-seed -q --sloppy
echo "Creating identity.pub for tests" echo "Creating identity.pub for tests"
../lsh-keygen -a dsa -l2 | ../lsh-writekey ../lsh-keygen -a dsa -l2 | ../lsh-writekey -c none
echo "Authorizing key for login" echo "Authorizing key for login"
"$srcdir/../lsh-authorize" "$HOME/.lsh/identity.pub" "$srcdir/../lsh-authorize" "$HOME/.lsh/identity.pub"
......
...@@ -11,4 +11,4 @@ fi ...@@ -11,4 +11,4 @@ fi
. $srcdir/functions.sh . $srcdir/functions.sh
rm -f foo foo.pub rm -f foo foo.pub
../lsh-writekey -o foo < $srcdir/key-1.private && [ -s foo -a -s foo.pub ] && test_success ../lsh-writekey -c none -o foo < $srcdir/key-1.private && [ -s foo -a -s foo.pub ] && test_success
...@@ -11,5 +11,5 @@ fi ...@@ -11,5 +11,5 @@ fi
. $srcdir/functions.sh . $srcdir/functions.sh
rm -rf temphome && mkdir temphome rm -rf temphome && mkdir temphome
HOME="`pwd`/temphome" ../lsh-writekey < $srcdir/key-1.private \ HOME="`pwd`/temphome" ../lsh-writekey -c none < $srcdir/key-1.private \
&& [ -s "temphome/.lsh/identity" -a -s "temphome/.lsh/identity.pub" ] && test_success && [ -s "temphome/.lsh/identity" -a -s "temphome/.lsh/identity.pub" ] && test_success
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment