Wed Jun 10 16:38:21 2009 UTC ()
Add netpgpkeys to the programs to build, and list the keys in the current
keyring as another test.


(agc)
diff -r1.10 -r1.11 src/crypto/external/bsd/netpgp/dist/tst
cvs diff -r1.10 -r1.11 src/crypto/external/bsd/netpgp/dist/tst (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/tst 2009/06/09 00:56:15 1.10
+++ src/crypto/external/bsd/netpgp/dist/tst 2009/06/10 16:38:21 1.11
@@ -1,30 +1,34 @@ @@ -1,30 +1,34 @@
1#! /bin/sh 1#! /bin/sh
2 2
3env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../lib && \ 3env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../lib && \
4 make cleandir ; \ 4 make cleandir ; \
5 make ; \ 5 make ; \
6 su root -c "make install"' 6 su root -c "make install"'
7env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../netpgp && \ 7env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../netpgp && \
8 make cleandir ; \ 8 make cleandir ; \
9 make ; \ 9 make ; \
10 su root -c "make install"' 10 su root -c "make install"'
 11env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../netpgpkeys && \
 12 make cleandir ; \
 13 make ; \
 14 su root -c "make install"'
11env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../netpgpverify && \ 15env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../netpgpverify && \
12 make cleandir ; \ 16 make cleandir ; \
13 make ; \ 17 make ; \
14 su root -c "make install"' 18 su root -c "make install"'
15 19
16passed=0 20passed=0
17total=13 21total=14
18echo "======> sign/verify 180938 file" 22echo "======> sign/verify 180938 file"
19cp configure a 23cp configure a
20/usr/bin/netpgp --sign a 24/usr/bin/netpgp --sign a
21/usr/bin/netpgp --verify a.gpg && passed=$(expr $passed + 1) 25/usr/bin/netpgp --verify a.gpg && passed=$(expr $passed + 1)
22echo "======> attempt to verify an unsigned file" 26echo "======> attempt to verify an unsigned file"
23/usr/bin/netpgp --verify a || passed=$(expr $passed + 1) 27/usr/bin/netpgp --verify a || passed=$(expr $passed + 1)
24echo "======> encrypt/decrypt 10809 file" 28echo "======> encrypt/decrypt 10809 file"
25cp src/netpgp/netpgp.1 b 29cp src/netpgp/netpgp.1 b
26/usr/bin/netpgp --encrypt b 30/usr/bin/netpgp --encrypt b
27/usr/bin/netpgp --decrypt b.gpg 31/usr/bin/netpgp --decrypt b.gpg
28diff src/netpgp/netpgp.1 b && passed=$(expr $passed + 1) 32diff src/netpgp/netpgp.1 b && passed=$(expr $passed + 1)
29echo "======> encrypt/decrypt 180938 file" 33echo "======> encrypt/decrypt 180938 file"
30cp configure c 34cp configure c
@@ -53,17 +57,19 @@ echo "======> netpgp list-packets test" @@ -53,17 +57,19 @@ echo "======> netpgp list-packets test"
53/usr/bin/netpgp --list-packets || passed=$(expr $passed + 1) 57/usr/bin/netpgp --list-packets || passed=$(expr $passed + 1)
54echo "======> version information" 58echo "======> version information"
55/usr/bin/netpgp --version 59/usr/bin/netpgp --version
56echo "======> netpgpverify file" 60echo "======> netpgpverify file"
57/usr/bin/netpgpverify a.gpg && passed=$(expr $passed + 1) 61/usr/bin/netpgpverify a.gpg && passed=$(expr $passed + 1)
58echo "======> attempt to verify an unsigned file" 62echo "======> attempt to verify an unsigned file"
59/usr/bin/netpgpverify a || passed=$(expr $passed + 1) 63/usr/bin/netpgpverify a || passed=$(expr $passed + 1)
60echo "======> sign/verify detached signature file" 64echo "======> sign/verify detached signature file"
61ls -l f f.sig 65ls -l f f.sig
62/usr/bin/netpgpverify f.sig && passed=$(expr $passed + 1) 66/usr/bin/netpgpverify f.sig && passed=$(expr $passed + 1)
63echo "======> another verify signature - verified cat command" 67echo "======> another verify signature - verified cat command"
64/usr/bin/netpgpverify --output=a3 a.gpg 68/usr/bin/netpgpverify --output=a3 a.gpg
65diff a a3 && passed=$(expr $passed + 1) 69diff a a3 && passed=$(expr $passed + 1)
 70echo "======> list keys"
 71/usr/bin/netpgpkeys --list-keys && passed=$(expr $passed + 1)
66echo "======> version information" 72echo "======> version information"
67/usr/bin/netpgpverify --version 73/usr/bin/netpgpverify --version
68rm -f a a.gpg b b.gpg c c.gpg d d.gpg e f f.sig a2 a3 74rm -f a a.gpg b b.gpg c c.gpg d d.gpg e f f.sig a2 a3
69echo "Passed ${passed}/${total} tests" 75echo "Passed ${passed}/${total} tests"