Module Name: src
Committed By: lukem
Date: Wed May 27 06:47:58 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/tests: atlocal.in init.at
testsuite.at verify.at
Added Files:
src/crypto/external/bsd/netpgp/dist/tests: key-private.asc
key-public.asc
Log Message:
Provide a passphraseless test key for the testsuite.
Use gpg to import the test key until netpgp's key management is overhauled.
Per discussion with Alistair.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/tests/atlocal.in \
src/crypto/external/bsd/netpgp/dist/tests/init.at
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/tests/key-private.asc \
src/crypto/external/bsd/netpgp/dist/tests/key-public.asc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/tests/testsuite.at \
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/atlocal.in
diff -u src/crypto/external/bsd/netpgp/dist/tests/atlocal.in:1.2 src/crypto/external/bsd/netpgp/dist/tests/atlocal.in:1.3
--- src/crypto/external/bsd/netpgp/dist/tests/atlocal.in:1.2 Wed May 27 01:54:22 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/atlocal.in Wed May 27 06:47:57 2009
@@ -1,10 +1,12 @@
-# $Id: atlocal.in,v 1.2 2009/05/27 01:54:22 lukem Exp $
+# $NetBSD: atlocal.in,v 1.3 2009/05/27 06:47:57 lukem Exp $
topsrcd...@abs_top_srcdir@
export TOPSRCDIR
-testro...@abs_builddir@/root
-export TESTROOT
-
netp...@abs_top_builddir@/src/bin/netpgp
export NETPGP
+
+testhomed...@abs_builddir@/homedir
+testpublick...@abs_srcdir@/key-public.asc
+testprivatek...@abs_srcdir@/key-private.asc
+testuserid=C7AB5F325F918728
Index: src/crypto/external/bsd/netpgp/dist/tests/init.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/init.at:1.2 src/crypto/external/bsd/netpgp/dist/tests/init.at:1.3
--- src/crypto/external/bsd/netpgp/dist/tests/init.at:1.2 Wed May 27 00:38:27 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/init.at Wed May 27 06:47:57 2009
@@ -1,20 +1,20 @@
-# $Id: init.at,v 1.2 2009/05/27 00:38:27 agc Exp $
+# $NetBSD: init.at,v 1.3 2009/05/27 06:47:57 lukem Exp $
AT_SETUP([init])
-# remove any previous testsuite run $TESTROOT
-AT_CHECK([rm -rf $TESTROOT], [0], [ignore], [ignore])
+# Remove any previous testsuite run's $testhomedir
+AT_CHECK([rm -rf $testhomedir], [0], [ignore], [ignore])
-# create $TESTROOT as fake $HOME
-AT_CHECK([mkdir -p $TESTROOT], [0], [ignore], [ignore])
+# Create $testhomedir as fake $HOME/.gnupg
+AT_CHECK([mkdir -m 700 -p $testhomedir], [0], [ignore], [ignore])
-#XXX provide pubkey.asc and privkey.asc for this
-# import public key for tests
-AT_CHECK([$NETPGP --homedir=$TESTROOT --import < $TOPSRCDIR/files/pubkey.asc],
+# Create a gpg.conf
+AT_CHECK([echo "default-key $testuserid" > $testhomedir/gpg.conf],
[0], [ignore], [ignore])
-# import private key for tests
-AT_CHECK([$NETPGP --homedir=$TESTROOT --import < $TOPSRCDIR/files/privkey.asc],
+# Import private key for tests
+# XXX: Use GPG until NetPGP's key management is overhauled
+AT_CHECK([gpg --batch --homedir $testhomedir --import < $testprivatekey],
[0], [ignore], [ignore])
AT_CLEANUP
Index: src/crypto/external/bsd/netpgp/dist/tests/testsuite.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/testsuite.at:1.1 src/crypto/external/bsd/netpgp/dist/tests/testsuite.at:1.2
--- src/crypto/external/bsd/netpgp/dist/tests/testsuite.at:1.1 Tue May 26 04:27:30 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/testsuite.at Wed May 27 06:47:57 2009
@@ -1,4 +1,4 @@
-# $Id: testsuite.at,v 1.1 2009/05/26 04:27:30 lukem Exp $
+# $NetBSD: testsuite.at,v 1.2 2009/05/27 06:47:57 lukem Exp $
AT_INIT([netpgp])
Index: src/crypto/external/bsd/netpgp/dist/tests/verify.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.1 src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.2
--- src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.1 Tue May 26 04:27:30 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/verify.at Wed May 27 06:47:57 2009
@@ -1,11 +1,13 @@
-# $Id: verify.at,v 1.1 2009/05/26 04:27:30 lukem Exp $
+# $NetBSD: verify.at,v 1.2 2009/05/27 06:47:57 lukem Exp $
AT_SETUP([check-verify])
cp ${TOPSRCDIR}/configure a
-AT_CHECK([$NETPGP --sign a], [0], [ignore], [ignore])
+AT_CHECK([$NETPGP --homedir $testhomedir --sign a],
+ [0], [ignore], [ignore])
-AT_CHECK([$NETPGP --verify a.pgp], [0], [ignore], [ignore])
+AT_CHECK([$NETPGP --homedir $testhomedir --verify a.gpg],
+ [0], [ignore], [ignore])
AT_CLEANUP
Added files:
Index: src/crypto/external/bsd/netpgp/dist/tests/key-private.asc
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/tests/key-private.asc:1.1
--- /dev/null Wed May 27 06:47:58 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/key-private.asc Wed May 27 06:47:57 2009
@@ -0,0 +1,58 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: GnuPG v1.4.9 (NetBSD)
+
+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
+Sb4oL4ERHdmfE3TMUFA0rgiGIEWB5N0aEiu9
+=drs+
+-----END PGP PRIVATE KEY BLOCK-----
Index: src/crypto/external/bsd/netpgp/dist/tests/key-public.asc
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/tests/key-public.asc:1.1
--- /dev/null Wed May 27 06:47:58 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/key-public.asc Wed May 27 06:47:57 2009
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (NetBSD)
+
+mQENBEoc2XIBCAC+jo609m0rMwFbdTJMh4Q6cSWbwbIn1hgGg02d4QealxWCw4MG
+RmQaWOo1qWknmcDVCpERoBiJNugIwIi/tmpS9O/E6X1JtF4yNk0JaAj8TlD6tJnv
+w/inLI/Q4ionHKQhp483s6LGOX5NKAoiiqdEdNLGWA/xHqHBgZRdWvUN/lOTCjjN
+tVC0jFMN20zVem4jIp9pPCqKwK0vEOH+OutiOoiBXeDn54nKPcwKfLESvP58E+k9
+IQgAqgqz1frKyM6oHQkqbx3oVQkrTC/hcFiUat9XSksJ/bLNfSl+qo7pajdDL3Bu
+Hmn/StanxZzHiE7WYdA5/CCMNv1TRKS8Vc6RABEBAAG0R05ldFBHUCB0ZXN0IHN1
+aXRlICh0ZXN0IC0gZG8gbm90IHVzZSkgPGFnYy1uZXRwZ3AtdGVzdHN1aXRlQE5l
+dEJTRC5vcmc+iQE3BBMBAgAhBQJKHNlyAhsDBwsJCAcDAgEEFQIIAwQWAgMBAh4B
+AheAAAoJEMerXzJfkYco2X8H/iZGcNwaatdhlcuT8pPXvFTXe6qx8OwOv7fJmq/z
+/yqx2S7B3dB1tnyfe5Q0kk2Wgf4sovh5BCS727tx/P1VQrurn2YjWtq2PVpYZrH0
+0gTnhD2fWYP7QO/Qu0kVPsoq6/LRWfVAIuj1ezteZ689sF+1NnTo+2Q6BNFyXGdO
+BPmAp5HQLFaubN/bn1NwNCcGVwyuI4iNZqgVBapVJLil5RHY+3ffDfnk3QIQos07
+1WOi2y2TiDgGi2ZRlJT99/0oRjFjDcjwCAfoa3rfaIxdrShedQ9I0Y3aP/n0IQpl
+hV6XGRACCJuWVTPx9IBRfMTEpFeSm/+eDJ0urRANuiq9zA+5AQ0EShzZtAEIAMN6
+2rVntTv3pll/lci5dRE67l8MACCmiO3e0yl5YKsdfhDXAPd54Slp5qFVqW2VMb+Q
+ixg/SJ8J3XznMt/AyCMrBmuJYfUYX2A8+X1ROEqHLjCI1xGvsL0KB7M2zJmeufTx
+uFgfbWrS5Ht3Gs6ZEqz4lThqzzM3cXZ501hBdzXI8CLg2TEQswWe6/48cmty2BpM
+PGUQH1cI6cVlbTz9NhFRGeAFa7mxXEnYgb1GqVwRwx7zst4jSNHI0o76Wikbo9W/
+srp4bMacp1Vg0PDsNpfSeN0vZfBjdBvzESmDDkezZ9w21ktV5voWDM0bEeNV0p5Q
+sf+0V3QQGC6Bozfkp+0AEQEAAYkBHwQYAQIACQUCShzZtAIbDAAKCRDHq18yX5GH
+KL0SCAC1K+7mvTYjnYi/tuGoChJb4+omMP+/lHcOzNEETWC536kr24AKDKcRYnXS
+kHmk9lyyRcRaFy4j5o4rpRakBvbWGpGMRQDWbwHQi6ocOsplnmwXczf8lMhFDZgm
+iRhCIlmBFBVQhjQcQ+ELQ9y9g0UP0rtCEUuv4Q8+1UIiO9PUMwWpOiIRQS727tsE
+0I7BEL4v3lD0ZtBDq7DLC/R3tniao509G5TY0YT/hzQQgRk7ZiVt1DNrxhmoDqIm
+Yb/BdLbD/m/swvmGrgZ5v0JfLZ7TxvWYMU5q0qp27VQi2ykeD4fTzTnmSb4oL4ER
+HdmfE3TMUFA0rgiGIEWB5N0aEiu9
+=XlZq
+-----END PGP PUBLIC KEY BLOCK-----
