diff options
Diffstat (limited to 'checks')
| -rw-r--r-- | checks/ChangeLog | 11 | ||||
| -rw-r--r-- | checks/Makefile.am | 4 | ||||
| -rwxr-xr-x | checks/mkdemodirs | 6 | ||||
| -rwxr-xr-x | checks/sigs.test | 4 |
4 files changed, 19 insertions, 6 deletions
diff --git a/checks/ChangeLog b/checks/ChangeLog index 85e3ca067..1d07f7209 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,3 +1,14 @@ +2001-03-20 Werner Koch <[email protected]> + + * Makefile.am: Import the pubdemo.asc file + + * sigs.test (hash_algo_list): s/tiger/tiger192/ + +2001-03-19 Werner Koch <[email protected]> + + * mkdemodirs (GPGDEMO): Add --allow-secret-key-import to all gpg + invocations. Use echon -n instead of an argument with \c. + 2001-02-12 Werner Koch <[email protected]> * multisig.test: new diff --git a/checks/Makefile.am b/checks/Makefile.am index 27ca45360..9c8c43d63 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -19,6 +19,7 @@ ## Process this file with automake to create Makefile.in GPG_DEARMOR = ../g10/gpg --no-options --quiet --yes --dearmor +GPG_IMPORT = ../g10/gpg --homedir . --no-options --quiet --yes --import TESTS = version.test mds.test \ decrypt.test decrypt-dsa.test \ @@ -57,8 +58,9 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ echo timestamp >./prepared.stamp -./pubring.gpg: $(srcdir)/pubring.asc +./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc $(GPG_DEARMOR) -o ./pubring.gpg $(srcdir)/pubring.asc + $(GPG_IMPORT) $(srcdir)/pubdemo.asc ./secring.gpg: $(srcdir)/secring.asc $(GPG_DEARMOR) -o ./secring.gpg $(srcdir)/secring.asc diff --git a/checks/mkdemodirs b/checks/mkdemodirs index f0c7e02ba..d6b7d7c4c 100755 --- a/checks/mkdemodirs +++ b/checks/mkdemodirs @@ -2,7 +2,7 @@ set -e -GPG="../g10/gpg --batch --quiet --no-secmem-warning" +GPG="../g10/gpg --batch --quiet --no-secmem-warning --allow-secret-key-import" NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' @@ -19,9 +19,9 @@ $GPG --dearmor -o pubdemo.gpg --yes ../checks/pubdemo.asc [ -f ./tdb.tmp ] && rm ./tdb.tmp GPGDEMO="$GPG --homedir . --trustdb-name ./tdb.tmp --no-default-keyring --keyring pubdemo.gpg --secret-keyring secdemo.gpg" -/bin/echo "Creating:\c" +echo -n "Creating:" for name in $NAMES; do - /bin/echo " $name\c" + echo -n " $name" [ -d $name ] && rm -r $name mkdir $name $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg diff --git a/checks/sigs.test b/checks/sigs.test index a32388948..702a55476 100755 --- a/checks/sigs.test +++ b/checks/sigs.test @@ -10,8 +10,8 @@ for i in $plain_files $data_files; do done hash_algo_list="ripemd160 sha1 md5" -if have_hash_algo "TIGER"; then - hash_algo_list="$hash_algo_list tiger" +if have_hash_algo "TIGER192"; then + hash_algo_list="$hash_algo_list tiger192" fi for da in $hash_algo_list ; do |