Module Name:    src
Committed By:   agc
Date:           Wed May 27 14:42:07 UTC 2009

Modified Files:
        src/crypto/external/bsd/netpgp/dist/tests: testsuite.at verify.at
Added Files:
        src/crypto/external/bsd/netpgp/dist/tests: crypt.at detached.at

Log Message:
Add tests for detached signature creation and verification, and for
encryption and decryption via netpgp.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/dist/tests/crypt.at \
    src/crypto/external/bsd/netpgp/dist/tests/detached.at
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/netpgp/dist/tests/testsuite.at
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/tests/verify.at

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/tests/testsuite.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/testsuite.at:1.2 src/crypto/external/bsd/netpgp/dist/tests/testsuite.at:1.3
--- src/crypto/external/bsd/netpgp/dist/tests/testsuite.at:1.2	Wed May 27 06:47:57 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/testsuite.at	Wed May 27 14:42:07 2009
@@ -1,6 +1,8 @@
-# $NetBSD: testsuite.at,v 1.2 2009/05/27 06:47:57 lukem Exp $
+# $NetBSD: testsuite.at,v 1.3 2009/05/27 14:42:07 agc Exp $
 
 AT_INIT([netpgp])
 
 m4_include([init.at])
 m4_include([verify.at])
+m4_include([detached.at])
+m4_include([crypt.at])

Index: src/crypto/external/bsd/netpgp/dist/tests/verify.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.3 src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.4
--- src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.3	Wed May 27 07:00:32 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/verify.at	Wed May 27 14:42:07 2009
@@ -1,6 +1,6 @@
-# $NetBSD: verify.at,v 1.3 2009/05/27 07:00:32 lukem Exp $
+# $NetBSD: verify.at,v 1.4 2009/05/27 14:42:07 agc Exp $
 
-AT_SETUP([check-verify])
+AT_SETUP([check signatures and verification])
 
 cp ${TOPSRCDIR}/configure file1
 
@@ -13,6 +13,10 @@
 AT_CHECK([$NETPGP --homedir $testhomedir --verify file1.gpg],
     [0], [ignore], [ignore])
 
+# Cat the verified file
+AT_CHECK([$NETPGP --homedir $testhomedir --cat --output=file2 file1.gpg],
+    [0], [ignore], [ignore])
+
 # Fail to verify an unsigned file
 # XXX: determine how to expand $testuserid instead of hard-coding
 AT_CHECK([$NETPGP --homedir $testhomedir --verify file1],
@@ -21,7 +25,4 @@
 "file1": No signatures found - is this a signed file?
 ])
 
-# XXXTODO: deliberately corrupt file1.gpg and attempt to verify
-
-
 AT_CLEANUP

Added files:

Index: src/crypto/external/bsd/netpgp/dist/tests/crypt.at
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.1
--- /dev/null	Wed May 27 14:42:07 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/crypt.at	Wed May 27 14:42:07 2009
@@ -0,0 +1,27 @@
+# $NetBSD: crypt.at,v 1.1 2009/05/27 14:42:07 agc Exp $
+
+AT_SETUP([encryption and decryption])
+
+cp ${TOPSRCDIR}/configure file1
+
+# Sign the file
+# XXX: this prompts for a passphrase when the userid doesn't have one
+AT_CHECK([$NETPGP --homedir $testhomedir --encrypt file1],
+    [0], [ignore], [ignore])
+
+# Verify the signed file
+AT_CHECK([$NETPGP --homedir $testhomedir --decrypt file1.gpg],
+    [0], [ignore], [ignore])
+
+# Fail to verify an unsigned file
+# XXX: determine how to expand $testuserid instead of hard-coding
+#AT_CHECK([$NETPGP --homedir $testhomedir --decrypt file1],
+#    [1], [ignore],
+#[netpgp: default key set to "C7AB5F325F918728"
+#"file1": No signatures found - is this an encrypted file?
+#])
+
+# XXXTODO: deliberately corrupt file1.gpg and attempt to verify
+
+
+AT_CLEANUP
Index: src/crypto/external/bsd/netpgp/dist/tests/detached.at
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.1
--- /dev/null	Wed May 27 14:42:07 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/detached.at	Wed May 27 14:42:07 2009
@@ -0,0 +1,17 @@
+# $NetBSD: detached.at,v 1.1 2009/05/27 14:42:07 agc Exp $
+
+AT_SETUP([detached signature and verification])
+
+cp ${TOPSRCDIR}/configure file2
+
+# Detached signature
+AT_CHECK([$NETPGP --homedir $testhomedir --sign --detached file2],
+    [0], [ignore], [ignore])
+
+# Verify detached sig file
+AT_CHECK([$NETPGP --homedir $testhomedir --verify file2.sig],
+    [0], [ignore], [ignore])
+
+# XXXTODO: deliberately corrupt file2.gpg and attempt to verify
+
+AT_CLEANUP

Reply via email to