[src/trunk]: src/crypto/external/bsd/netpgp/dist enumerate all the tests to s...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f6f26cfb5087
branches:  trunk
changeset: 754664:f6f26cfb5087
user:      agc <agc%NetBSD.org@localhost>
date:      Sat May 08 02:18:05 2010 +0000

description:
enumerate all the tests to see easily which ones failed.
add a test for signed armored detached signature and verification

diffstat:

 crypto/external/bsd/netpgp/dist/tst |  47 +++++++++++++++++++++++++++++++++---
 1 files changed, 43 insertions(+), 4 deletions(-)

diffs (146 lines):

diff -r 220dd2dac8b6 -r f6f26cfb5087 crypto/external/bsd/netpgp/dist/tst
--- a/crypto/external/bsd/netpgp/dist/tst       Sat May 08 02:17:15 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/tst       Sat May 08 02:18:05 2010 +0000
@@ -31,23 +31,29 @@
        su root -c "make install"'
 
 passed=0
-total=28
+total=32
+rm -f passed
+date > passed
 echo "======> sign/verify 180938 file"
 cp configure a
 /usr/bin/netpgp --sign a
 /usr/bin/netpgp --verify a.gpg && passed=$(expr $passed + 1)
+echo "1 " $passed >> passed
 echo "======> attempt to verify an unsigned file"
 /usr/bin/netpgp --verify a || passed=$(expr $passed + 1)
+echo "2 " $passed >> passed
 echo "======> encrypt/decrypt 10809 file"
 cp src/netpgp/netpgp.1 b
 /usr/bin/netpgp --encrypt b
 /usr/bin/netpgp --decrypt b.gpg
 diff src/netpgp/netpgp.1 b && passed=$(expr $passed + 1)
+echo "3 " $passed >> passed
 echo "======> encrypt/decrypt 180938 file"
 cp configure c
 /usr/bin/netpgp --encrypt c
 /usr/bin/netpgp --decrypt c.gpg
 diff configure c && passed=$(expr $passed + 1)
+echo "4 " $passed >> passed
 echo "======> encrypt/decrypt bigass file"
 cat configure configure configure configure configure configure > d
 ls -l d
@@ -55,75 +61,108 @@
 /usr/bin/netpgp --encrypt d
 /usr/bin/netpgp --decrypt d.gpg
 diff e d && passed=$(expr $passed + 1)
+echo "5 " $passed >> passed
 echo "======> sign/verify detached signature file"
 cat configure configure configure configure configure configure > f
 /usr/bin/netpgp --sign --detached f
 ls -l f f.sig
 /usr/bin/netpgp --verify f.sig && passed=$(expr $passed + 1)
+echo "6 " $passed >> passed
 echo "======> cat signature - verified cat command"
 /usr/bin/netpgp --cat a.gpg > a2
 diff a a2 && passed=$(expr $passed + 1)
+echo "7 " $passed >> passed
 echo "======> another cat signature - verified cat command"
 /usr/bin/netpgp --cat --output=a3 a.gpg
 diff a a3 && passed=$(expr $passed + 1)
+echo "8 " $passed >> passed
 echo "======> netpgp list-packets test"
 /usr/bin/netpgp --list-packets || passed=$(expr $passed + 1)
+echo "9 " $passed >> passed
 echo "======> version information"
-/usr/bin/netpgp --version
+/usr/bin/netpgp --version && passed=$(expr $passed + 1)
+echo "10 " $passed >> passed
 echo "======> netpgpverify file"
 /usr/bin/netpgpverify a.gpg && passed=$(expr $passed + 1)
+echo "11 " $passed >> passed
 echo "======> attempt to verify an unsigned file"
 /usr/bin/netpgpverify a || passed=$(expr $passed + 1)
+echo "12 " $passed >> passed
 echo "======> sign/verify detached signature file"
 ls -l f f.sig
 /usr/bin/netpgpverify f.sig && passed=$(expr $passed + 1)
+echo "13 " $passed >> passed
 echo "======> another verify signature - verified cat command"
 /usr/bin/netpgpverify --output=a3 a.gpg
 diff a a3 && passed=$(expr $passed + 1)
+echo "14 " $passed >> passed
 echo "======> list keys"
 /usr/bin/netpgpkeys --list-keys && passed=$(expr $passed + 1)
+echo "15 " $passed >> passed
 echo "======> version information"
-/usr/bin/netpgpverify --version
+/usr/bin/netpgpverify --version && passed=$(expr $passed + 1)
+echo "16 " $passed >> passed
 echo "======> find specific key information"
 /usr/bin/netpgpkeys --get-key c0596823 agc%netbsd.org@localhost && passed=$(expr $passed + 1)
+echo "17 " $passed >> passed
 echo "======> ascii armoured signature"
 cp Makefile.am g
 /usr/bin/netpgp --sign --armor g && passed=$(expr $passed + 1)
+echo "18 " $passed >> passed
 echo "======> ascii armoured sig detection and verification"
 /usr/bin/netpgp --verify g.asc && passed=$(expr $passed + 1)
+echo "19 " $passed >> passed
 echo "======> ascii armoured signature of large file"
 cp Makefile.in g
 /usr/bin/netpgp --sign --armor g && passed=$(expr $passed + 1)
+echo "20 " $passed >> passed
 echo "======> ascii armoured sig detection and verification of large file"
 /usr/bin/netpgp --verify g.asc && passed=$(expr $passed + 1)
+echo "21 " $passed >> passed
 echo "======> verify memory by recognising ascii armour"
 /usr/bin/netpgp --cat < g.asc > g2
 diff g g2 && passed=$(expr $passed + 1)
+echo "22 " $passed >> passed
 echo "======> list ssh host RSA public key"
 /usr/bin/netpgpkeys --ssh-keys --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub --list-keys && passed=$(expr $passed + 1)
+echo "23 " $passed >> passed
 echo "======> sign/verify file with ssh host keys"
 cp configure a
 sudo /usr/bin/netpgp --ssh-keys --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub --sign a
 sudo chmod 644 a.gpg
 /usr/bin/netpgp --verify --ssh-keys --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub a.gpg && passed=$(expr $passed + 1)
+echo "24 " $passed >> passed
 echo "======> pipeline and memory encrypt/decrypt"
 /usr/bin/netpgp --encrypt < a | /usr/bin/netpgp --decrypt > a4
 diff a a4 && passed=$(expr $passed + 1)
+echo "25 " $passed >> passed
 echo "======> pipeline and memory sign/verify"
 /usr/bin/netpgp --sign < a | /usr/bin/netpgp --cat > a5
 diff a a5 && passed=$(expr $passed + 1)
+echo "26 " $passed >> passed
 echo "======> verify within a duration"
 cp Makefile.am h
 /usr/bin/netpgp --sign --duration 6m --detached h
 /usr/bin/netpgp --verify h.sig && passed=$(expr $passed + 1)
+echo "27 " $passed >> passed
 echo "======> invalid signature - expired"
 rm -f h.sig
 /usr/bin/netpgp --sign --duration 2 --detached h
 sleep 3
 /usr/bin/netpgp --verify h.sig || passed=$(expr $passed + 1)
+echo "28 " $passed >> passed
 echo "======> list signatures and subkey signatures"
 /usr/bin/netpgpkeys --list-sigs && passed=$(expr $passed + 1)
+echo "29 " $passed >> passed
 echo "======> generate a new RSA key"
 /usr/bin/netpgpkeys --generate-key && passed=$(expr $passed + 1)
-rm -f a a.gpg b b.gpg c c.gpg d d.gpg e f f.sig g g.asc g2 a2 a3 a4 a5 h h.sig
+echo "30 " $passed >> passed
+echo "======> ascii detached armoured signature"
+cp Makefile.am i
+/usr/bin/netpgp --sign --armor --detached i && passed=$(expr $passed + 1)
+echo "31 " $passed >> passed
+echo "======> ascii detached armoured sig detection and verification"
+/usr/bin/netpgp --verify i.asc && passed=$(expr $passed + 1)
+echo "32 " $passed >> passed
+rm -f a a.gpg b b.gpg c c.gpg d d.gpg e f f.sig g g.asc g2 a2 a3 a4 a5 h h.sig i i.asc
 echo "Passed ${passed}/${total} tests"