Module Name: src
Committed By: lukem
Date: Thu Jun 11 02:36:38 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/tests: cat.at crypt.at detached.at
verify.at
Log Message:
(ab)use --pass-fd to avoid the passphrase prompt
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/tests/cat.at
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/tests/crypt.at \
src/crypto/external/bsd/netpgp/dist/tests/detached.at
cvs rdiff -u -r1.7 -r1.8 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/cat.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.3 src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.4
--- src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.3 Thu Jun 11 02:28:50 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/cat.at Thu Jun 11 02:36:38 2009
@@ -1,11 +1,11 @@
-# $NetBSD: cat.at,v 1.3 2009/06/11 02:28:50 lukem Exp $
+# $NetBSD: cat.at,v 1.4 2009/06/11 02:36:38 lukem Exp $
AT_SETUP([attached signature and verification])
AT_CHECK([cp $abs_top_builddir/libtool file3], [0], [ignore], [ignore])
# Make signature
-AT_CHECK([netpgp --homedir $testhomedir --sign file3],
+AT_CHECK([echo '' | netpgp --pass-fd 0 --homedir $testhomedir --sign file3],
[0], [ignore], [ignore])
# Verify sig file
Index: src/crypto/external/bsd/netpgp/dist/tests/crypt.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.4 src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.5
--- src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.4 Thu Jun 11 02:28:50 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/crypt.at Thu Jun 11 02:36:38 2009
@@ -1,11 +1,10 @@
-# $NetBSD: crypt.at,v 1.4 2009/06/11 02:28:50 lukem Exp $
+# $NetBSD: crypt.at,v 1.5 2009/06/11 02:36:38 lukem Exp $
AT_SETUP([encryption and decryption])
AT_CHECK([cp ${TOPSRCDIR}/configure file1], [0], [ignore], [ignore])
# 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])
Index: src/crypto/external/bsd/netpgp/dist/tests/detached.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.4 src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.5
--- src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.4 Thu Jun 11 02:28:50 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/detached.at Thu Jun 11 02:36:38 2009
@@ -1,11 +1,11 @@
-# $NetBSD: detached.at,v 1.4 2009/06/11 02:28:50 lukem Exp $
+# $NetBSD: detached.at,v 1.5 2009/06/11 02:36:38 lukem Exp $
AT_SETUP([detached signature and verification])
AT_CHECK([cp ${TOPSRCDIR}/configure file2], [0], [ignore], [ignore])
# Detached signature
-AT_CHECK([netpgp --homedir $testhomedir --sign --detached file2],
+AT_CHECK([echo '' | netpgp --pass-fd 0 --homedir $testhomedir --sign --detached file2],
[0], [ignore], [ignore])
# Verify detached sig file
Index: src/crypto/external/bsd/netpgp/dist/tests/verify.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.7 src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.8
--- src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.7 Thu Jun 11 02:28:50 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/verify.at Thu Jun 11 02:36:38 2009
@@ -1,12 +1,11 @@
-# $NetBSD: verify.at,v 1.7 2009/06/11 02:28:50 lukem Exp $
+# $NetBSD: verify.at,v 1.8 2009/06/11 02:36:38 lukem Exp $
AT_SETUP([simple signature and verification])
AT_CHECK([cp ${TOPSRCDIR}/configure file1], [0], [ignore], [ignore])
# Sign the file
-# XXX: this prompts for a passphrase when the userid doesn't have one
-AT_CHECK([netpgp --homedir $testhomedir --sign file1],
+AT_CHECK([echo '' | netpgp --pass-fd 0 --homedir $testhomedir --sign file1],
[0], [ignore], [ignore])
# Verify the signed file
