Thu Nov 4 15:39:43 2010 UTC ()
add an additional test for the user-specified cipher


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

--- src/crypto/external/bsd/netpgp/dist/tst 2010/09/01 17:25:57 1.29
+++ src/crypto/external/bsd/netpgp/dist/tst 2010/11/04 15:39:42 1.30
@@ -26,27 +26,27 @@ env USETOOLS=no MAKEOBJDIRPREFIX=/usr/ob @@ -26,27 +26,27 @@ env USETOOLS=no MAKEOBJDIRPREFIX=/usr/ob
26 make cleandir ; \ 26 make cleandir ; \
27 make ; \ 27 make ; \
28 su root -c "make install"' 28 su root -c "make install"'
29env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../netpgpkeys && \ 29env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../netpgpkeys && \
30 make cleandir ; \ 30 make cleandir ; \
31 make ; \ 31 make ; \
32 su root -c "make install"' 32 su root -c "make install"'
33env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../netpgpverify && \ 33env USETOOLS=no MAKEOBJDIRPREFIX=/usr/obj/i386 sh -c 'cd ../netpgpverify && \
34 make cleandir ; \ 34 make cleandir ; \
35 make ; \ 35 make ; \
36 su root -c "make install"' 36 su root -c "make install"'
37 37
38passed=0 38passed=0
39total=35 39total=36
40rm -f passed 40rm -f passed
41date > passed 41date > passed
42echo "======> sign/verify 180938 file" 42echo "======> sign/verify 180938 file"
43cp configure a 43cp configure a
44/usr/bin/netpgp --sign a 44/usr/bin/netpgp --sign a
45/usr/bin/netpgp --verify a.gpg && passed=$(expr $passed + 1) 45/usr/bin/netpgp --verify a.gpg && passed=$(expr $passed + 1)
46echo "1 " $passed >> passed 46echo "1 " $passed >> passed
47echo "======> attempt to verify an unsigned file" 47echo "======> attempt to verify an unsigned file"
48/usr/bin/netpgp --verify a || passed=$(expr $passed + 1) 48/usr/bin/netpgp --verify a || passed=$(expr $passed + 1)
49echo "2 " $passed >> passed 49echo "2 " $passed >> passed
50echo "======> encrypt/decrypt 10809 file" 50echo "======> encrypt/decrypt 10809 file"
51cp src/netpgp/netpgp.1 b 51cp src/netpgp/netpgp.1 b
52/usr/bin/netpgp --encrypt b 52/usr/bin/netpgp --encrypt b
@@ -174,15 +174,19 @@ netpgpkey=$(/usr/bin/netpgpkeys --ssh -- @@ -174,15 +174,19 @@ netpgpkey=$(/usr/bin/netpgpkeys --ssh --
174sshkey=$(/usr/bin/ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub | awk '{ gsub(":", "", $2); print $2 }') 174sshkey=$(/usr/bin/ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub | awk '{ gsub(":", "", $2); print $2 }')
175echo "host sshkey \"$sshkey\" = netpgpkey \"$netpgpkey\"" 175echo "host sshkey \"$sshkey\" = netpgpkey \"$netpgpkey\""
176[ $sshkey = $netpgpkey ] && passed=$(expr $passed + 1) 176[ $sshkey = $netpgpkey ] && passed=$(expr $passed + 1)
177echo "33 " $passed >> passed 177echo "33 " $passed >> passed
178echo "======> user ssh fingerprint and netpgp fingerprint" 178echo "======> user ssh fingerprint and netpgp fingerprint"
179netpgpkey=$(/usr/bin/netpgpkeys --ssh --list-keys --hash=md5 | awk 'NR == 3 { print $3 $4 $5 $6 $7 $8 $9 $10 }') 179netpgpkey=$(/usr/bin/netpgpkeys --ssh --list-keys --hash=md5 | awk 'NR == 3 { print $3 $4 $5 $6 $7 $8 $9 $10 }')
180sshkey=$(/usr/bin/ssh-keygen -l -f /home/agc/.ssh/id_rsa.pub | awk '{ gsub(":", "", $2); print $2 }') 180sshkey=$(/usr/bin/ssh-keygen -l -f /home/agc/.ssh/id_rsa.pub | awk '{ gsub(":", "", $2); print $2 }')
181echo "user sshkey \"$sshkey\" = netpgpkey \"$netpgpkey\"" 181echo "user sshkey \"$sshkey\" = netpgpkey \"$netpgpkey\""
182[ $sshkey = $netpgpkey ] && passed=$(expr $passed + 1) 182[ $sshkey = $netpgpkey ] && passed=$(expr $passed + 1)
183echo "34 " $passed >> passed 183echo "34 " $passed >> passed
184echo "======> single key listing" 184echo "======> single key listing"
185/usr/bin/netpgpkeys -l agc && passed=$(expr $passed + 1) 185/usr/bin/netpgpkeys -l agc && passed=$(expr $passed + 1)
186echo "35 " $passed >> passed 186echo "35 " $passed >> passed
187rm -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 187echo "======> pipeline and memory encrypt/decrypt with specified cipher"
 188/usr/bin/netpgp -e --cipher camellia128 < a | /usr/bin/netpgp -d > a6
 189diff a a6 && passed=$(expr $passed + 1)
 190echo "36 " $passed >> passed
 191rm -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 a6 h h.sig i i.asc
188echo "Passed ${passed}/${total} tests" 192echo "Passed ${passed}/${total} tests"