* clearsig.test, conventional-mdc.test, conventional.test, defs.inc,

encrypt-dsa.test, encrypt.test, genkey1024.test, plain-1.asc, plain-1-pgp.asc, plain-2.asc, plain-3.asc, pubring.asc, secring.asc, sigs.test: Rework tests to work properly with a gpg binary that doesn't have all ciphers and all pk algos. Basically, we test for the ciphers we have, only test signing with non-160-bit hashes with RSA (we test all hashes as hashes). Test all key lengths of AES.
2024-12-22 10:19:57 +01:00 · 2003-12-31 19:00:35 +00:00 · 2003-12-31 19:00:35 +00:00 · e7abe7e909
commit e7abe7e909
parent 2a785147be
15 changed files with 1041 additions and 873 deletions
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@ -1,3 +1,14 @@
+2003-12-31  David Shaw  <dshaw@jabberwocky.com>
+
+	* clearsig.test, conventional-mdc.test, conventional.test,
+	defs.inc, encrypt-dsa.test, encrypt.test, genkey1024.test,
+	plain-1.asc, plain-1-pgp.asc, plain-2.asc, plain-3.asc,
+	pubring.asc, secring.asc, sigs.test: Rework tests to work properly
+	with a gpg binary that doesn't have all ciphers and all pk algos.
+	Basically, we test for the ciphers we have, only test signing with
+	non-160-bit hashes with RSA (we test all hashes as hashes).  Test
+	all key lengths of AES.
+
 2003-12-05  David Shaw  <dshaw@jabberwocky.com>

 	* Makefile.am: Reenable tests now that the Elgamal signature keys
--- a/checks/clearsig.test
+++ b/checks/clearsig.test
@ -1,13 +1,9 @@
 #!/bin/sh

-
 # Fixme: we should not only do a --verify but also the output.

-
-
 . $srcdir/defs.inc || exit 3

-
 # ======================================
 # I can't compare the out because plain-3 has no LF as last charcater
 # but the output has always one.  I do not thinkl this is a bug, because
@ -18,14 +14,17 @@ for i in $plain_files plain-large ; do
    $GPG --verify x
 done

+
 # ======================================
 # and once more to check rfc1991
 # ======================================
-for i in $plain_files plain-large ; do
-    echo "$usrpass1" | $GPG --passphrase-fd 0 \
-			 --rfc1991 --digest-algo md5 -sat -o x --yes $i
-    $GPG --verify x
-done
+
+if have_cipher_algo "RSA"; then
+  for i in $plain_files plain-large ; do
+      $GPG -u $usrkeyid3 --rfc1991 --digest-algo md5 -sat -o x --yes $i
+      $GPG --verify x
+  done
+fi

 # ======================================
 # and one with long lines
@ -38,6 +37,7 @@ EOF
 echo "$usrpass1" | $GPG --passphrase-fd 0 --clearsign -o x --yes y
 $GPG --verify x

+
 # ======================================
 # and one with only one long lines
 # ======================================
@ -46,6 +46,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 EOF
 echo "$usrpass1" | $GPG --passphrase-fd 0 --clearsign -o x --yes y
 $GPG --verify x
+
+
 # ======================================
 # and one with an empty body
 # ======================================
@ -54,6 +56,7 @@ EOF
 echo "$usrpass1" | $GPG --passphrase-fd 0 --clearsign -o x --yes y
 $GPG --verify x

+
 # ======================================
 # and one with one empty line at the end
 # ======================================
@ -97,7 +100,3 @@ EOF
 echo "$usrpass1" | $GPG --passphrase-fd 0 \
 				   --not-dash-escaped --clearsign -o x --yes y
 $GPG --verify x
-
-
-
-
--- a/checks/conventional-mdc.test
+++ b/checks/conventional-mdc.test
@ -2,9 +2,31 @@

 . $srcdir/defs.inc || exit 3

+algos="3des"
+
+if have_cipher_algo "idea"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "cast5"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "blowfish"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "aes"; then
+   algos="$algos aes aes192 aes256"
+fi
+
+if have_cipher_algo "twofish"; then
+   algos="$algos twofish"
+fi
+
 #info Checking conventional encryption
 for i in 0 1 2 3 9 10 11 19 20 21 22 23 39 40 41 8192 32000 ; do
-  for ciph in 3des cast5 blowfish twofish rijndael; do
+  for ciph in $algos; do
    # *BSD's dd can't cope with a count of 0
    if test "$i" = "0"; then
        : >z
@ -18,4 +40,3 @@ for i in 0 1 2 3 9 10 11 19 20 21 22 23 39 40 41 8192 32000 ; do
    cmp z y || error "$ciph/$i: mismatch"
  done
 done
-
--- a/checks/conventional.test
+++ b/checks/conventional.test
@ -2,10 +2,6 @@

 . $srcdir/defs.inc || exit 3

-# temp. hack cause the format for 128 bit blocksize messages may change
-GNUPG_ENABLE_TWOFISH=1
-export GNUPG_ENABLE_TWOFISH
-
 #info Checking conventional encryption
 for i in plain-2 data-32000 ; do
    echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes $i
@ -13,7 +9,29 @@ for i in plain-2 data-32000 ; do
    cmp $i y || error "$i: mismatch"
 done

-for a in cast5 3des twofish; do
+algos="3des"
+
+if have_cipher_algo "idea"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "cast5"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "blowfish"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "aes"; then
+   algos="$algos aes aes192 aes256"
+fi
+
+if have_cipher_algo "twofish"; then
+   algos="$algos twofish"
+fi
+
+for a in $algos; do
    for i in plain-1 data-80000 ; do
      echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
 					  --cipher-algo $a -c -o x --yes $i
@ -21,4 +39,3 @@ for a in cast5 3des twofish; do
      cmp $i y || error "$i: ($a) mismatch"
    done
 done
-
--- a/checks/defs.inc
+++ b/checks/defs.inc
@ -9,6 +9,8 @@ usrname1="one"
 usrpass1="def"
 usrname2="two"
 usrpass2=""
+usrname3="three"
+usrpass3=""


 dsa_usrname1="pgp5"
@ -80,6 +82,23 @@ echo_n () {
 #    cleanup_files="$cleanup_files $*"
 #}

+have_pubkey_algo () {
+  if  ../g10/gpg --homedir .  --version | grep "Pubkey:.*$1" >/dev/null
+  then
+	true
+  else
+	false
+  fi
+}
+
+have_cipher_algo () {
+  if  ../g10/gpg --homedir .  --version | grep "Cipher:.*$1" >/dev/null
+  then
+	true
+  else
+	false
+  fi
+}

 have_hash_algo () {
  if  ../g10/gpg --homedir .  --version | grep "Hash:.*$1" >/dev/null
--- a/checks/encrypt-dsa.test
+++ b/checks/encrypt-dsa.test
@ -9,11 +9,33 @@ for i in $plain_files $data_files ; do
    cmp $i y || error "$i: mismatch"
 done

-# and with cast
-for i in $plain_files $data_files ; do
-    $GPG $dsa_keyrings --always-trust --cipher-algo cast5 -e \
-					-o x --yes -r "$dsa_usrname2" $i
-    $GPG $dsa_keyrings -o y --yes x
-    cmp $i y || error "$i: mismatch"
-done
+algos="3des"

+if have_cipher_algo "idea"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "cast5"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "blowfish"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "aes"; then
+   algos="$algos aes aes192 aes256"
+fi
+
+if have_cipher_algo "twofish"; then
+   algos="$algos twofish"
+fi
+
+for ca in $algos ; do
+    for i in $plain_files $data_files ; do
+	$GPG $dsa_keyrings --always-trust --cipher-algo $ca -e \
+	    -o x --yes -r "$dsa_usrname2" $i
+	$GPG $dsa_keyrings -o y --yes x
+	cmp $i y || error "$i: mismatch"
+    done
+done
--- a/checks/encrypt.test
+++ b/checks/encrypt.test
@ -8,9 +8,33 @@ for i in $plain_files $data_files ; do
    $GPG -o y --yes x
    cmp $i y || error "$i: mismatch"
 done
-for i in $plain_files $data_files ; do
-    $GPG --always-trust -e -o x --yes -r "$usrname2" --cipher-algo cast5 $i
-    $GPG -o y --yes x
-    cmp $i y || error "$i: mismatch"
-done

+algos="3des"
+
+if have_cipher_algo "idea"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "cast5"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "blowfish"; then
+   algos="$algos idea"
+fi
+
+if have_cipher_algo "aes"; then
+   algos="$algos aes aes192 aes256"
+fi
+
+if have_cipher_algo "twofish"; then
+   algos="$algos twofish"
+fi
+
+for ca in $algos ; do
+    for i in $plain_files $data_files ; do
+	$GPG --always-trust -e -o x --yes -r "$usrname2" --cipher-algo $ca $i
+	$GPG -o y --yes x
+	cmp $i y || error "$i: mismatch"
+    done
+done
--- a/checks/genkey1024.test
+++ b/checks/genkey1024.test
@ -13,6 +13,10 @@ Name-Email: hh@@ddorf.de
 Expire-Date: 1
 Passphrase: abc
 %commit
+EOF
+
+if have_pubkey_algo "RSA"; then
+../g10/gpg --quiet --batch --quick-random --homedir . --gen-key <<EOF
 Key-Type: RSA
 Key-Length: 1024
 Key-Usage: sign,encrypt
@ -23,4 +27,4 @@ Expire-Date: 2
 Passphrase: abc
 %commit
 EOF
-
+fi
--- a/checks/plain-1-pgp.asc
+++ b/checks/plain-1-pgp.asc
@ -1,29 +1,27 @@
-This is an encrypted version of plain-1 for
-the PGP test key 0xCB879DE9 using CAST.
-
+This is an encrypted version of plain-1 for the PGP test key
+0xCB879DE9 using 3DES.

 -----BEGIN PGP MESSAGE-----
-Version: PGPfreeware 5.0i for non-commercial use
-MessageID: D0P6k4cfvaTDkyRQM+/MpOoQW6xT5Swm
+Version: GnuPG v1.3.5-cvs (GNU/Linux)

-qANQR1DBwA4DW3oC8MuHnekQAwDj3tkgY6XU+e1k9XOlSSzIPGenxgOZ8VSvuEUd
-L+/1E9T2KJmH5CGyH4Hz6wIOLtFSd1A13yYRyHNhxD/nGgcjg6etZNVQnjPuRp5k
-O4jYz2BCstkjz793ZjPzgXgdpt0C/0zmlQz8clT+/cswAj0t1famcz/Ai4gexfkI
-pojmFHewdYs6FT0XbwxjaYUyw955KBEUwJ4uJ6VTR5ab4GxUmpHn/S7HfoWVPjXl
-j7R8Xw/5bsrOCjA5hd2XcpE95lTHzcnB9Fr57OMFlFC/FSwUaDsArZ/V8sUJnD+l
-aWyrDhzuiwVy2XSYiX55qCL3zuZsiElo6AS7ITkI8onL2FIFtC3L5LecPprNlE68
-XJLxNZUSAel7OcnwqUNtM1lEK6bfYfiXr0BBEkg1Jfx/KucHMIara0CVEh+V0aGj
-I8rKt3MS+T7KMYgJzf47ipTtf0Q3qZph28fRirn8gKBlEIRz62WU9Jjz/GrNqbuD
-meixSq3JprnK2kDZ00oqSZVCjFEc6pQoZqZc0cGT6IDpYEsNghfeyCxzUB17QzJC
-gisd5k0uSCIWO8lwbWInnDzmV8XTfG5o4u88S89ioGydxMlCcNNX2cNp/MH/chgk
-iSI+BAZ6mVcKdH2x6NpFJDGcogIM9phsnUC8NkOUH2FtjnCxDJyKSfML4lrEIi3x
-QCAFEx+dYq4xcT8AnEQcTJ4ppoUJwfbtqXxYh2TKSWSkXnNz6sp2AGlx/uc99CyB
-BjurpFQzseceTbxfJySm3LMJ470jSmwXSl3byryfiwTVV7BYoKkYfpVaXK4VHVMS
-bw15DEH8PqjkxRabokwhIpWsJ4ta+FCgaDYhdOvrBAztwm9edsYYiNdrwjn8zFzw
-QpOqh7h0uCksU5/ULmadIAYgejPyGJM6lv2m7o0xay4TOqyRMzkdcu0WyR3PVFAE
-iwk/uYIonNCJc3pFS8k4b3CYnSiso0z1ugJR5YcPoOuxrbdly1om4ZC0is+euQZN
-kzSGwfbabKY3mvRWGTGpZil43BRMK7nzL6oN0f7Y+/DTRp4Vzc0NTyfV2QkU25Il
-ARs4Cxa138Nw4fmfvenCvv2QL2Ks/HCM7lybhq2IvbRVRiOEgcPxvRtZ5VKrqbkM
-rrzzqi2PxlVrinR2GAkNu75ef+FP/KWP4NFYvEMpDxqXNS7Ju1sfcyFaTnm9
-=TpZW
+hM4DW3oC8MuHnekQAv0U6qlDAA64QS/oZJErr1J77m5Dh7IFen3mAcwOxvL/POqS
+HQWTFcuFT4LH9asSWgRe6DebJGfscMjMqNPAkhEJtKQQ2jEesn2Bon6SMwah7vkD
+9Zap7WKHRlnB/Da1/xQC/ispXY7e5tuejnzoNSAOWFpBn354nvkKGaCfMRNuz3R2
+HljH+gXKRa00n2dPmvX9Mr8AI0Q+FoEI2/YW+6aUxmv8b0c2dP6HcL6HUu0Ro2Nl
+RJNPfYXP20EL/Xrv8LN0Ksnp3YKTWrz5gQKNr3DH5pn1PjFqAKz4JD6rQBpnlh1c
+03gLB1OAJWA6+/QNaEQV451GBZW3ul10R/6621/kk0Isdxn/htlD4Jl/jAvFdlQW
+ULBu1HorZZ5X/IMuMRFwSQkx+H8i0zq+LGr8+rLFVTRuXBrgpeTLWs/f35DDblPp
+jtPGSs1qql98PfOV1tAr16rGRLAAyNWEgi3yZWUGgq5dfFnRbJX1hrj9waQmq1g0
+mn1oB9Ig708xSZqcfFVFNpvIB7nmbFF/WaMnqfL3XmgTe8whKB/f/XYhg+W2d57h
+EmTcAlC1N6IHY8/7YqtnjitavTIUsi0hPldX0tvrjsaZ7ppSma2epRJhx47jIFjw
+wXOEByZE+K3pyTSN8KJxParDsqrTWFrL0t8az9W8lWG7YYsxUxk9cwRo5PyEko1M
+kAKrbDMb+02Iw35yeuxFY33dl7KqpaWy43ksX/ROxX4S0InQywaQejXyt5A1cJN1
+t+G0aKdRp40MDKtOkZfFGlUSFZIhB0dxKVfSKJE/SIeYZzROTuyCNe/2wwufxgpa
+uztUf5ipVnINupiztWGw5c5Wp40ptQ/0K4/35KrZhMoFGR9DtImAPpZocuiFdJDt
+uqqapxGfJ876S4hFjRAkHSNRsAySul9zFLnIJ+Smk5xsvQZK4yjDwZfSs9b7WPKg
+7NCxl5bF5dIbWRYdRBNjHQ4m3LyYmqKzQqALSYT54/9O35B7rb1fOB2SFIuME0QI
+5XQq9QsH/f5rW8U6Ixzw1582B8fO1TMRhCqMyXozmsBJoWdCIQTQiVNyrbgLi+ss
+wKiKq4AymLXFMSpI4TOCc+rKiAdMpLbNO8Ndox5hZEGz+mqg84cgC/rkJc/P03KR
+uo0+rb5eSfJw9t+uzBXDmFHynayj0CB8wW9iwXknpdlHDo1z
+=7Otr
 -----END PGP MESSAGE-----
--- a/checks/plain-1.asc
+++ b/checks/plain-1.asc
@ -1,27 +1,26 @@
 -----BEGIN PGP MESSAGE-----
-Version: GnuPG v1.2.4rc1 (GNU/Linux)
-Comment: Key available at http://www.jabberwocky.com/david/keys.asc
+Version: GnuPG v1.3.5-cvs (GNU/Linux)

-hQEOAwDZAi05oo3jEAP/WcLsks2vVpWkKsRKzTdJrKyEV+aD+ApjzXSjrJnq8sdA
-h2uq4N1pjIyR9BVFifxozPNaSnhT6kOwt+fQTo9ogCsPB1mtjn5oSTUJxIEILMwY
-77Sb4R8okltH2eSXMDQMy1iul+VjhPype2OgpPwl554V0MsiIZCL+aI6xlse9YcD
-/iP65EHcVpAF4ugqGaF8SSH4J0X5ZFBZps2iVN5bwKqANJyFQ/Wb/SxkE63xR0kF
-L9pROi8C4NWzF67QvbsU5WCErhbYtBUvChvFk84CY1gPFA8pGuU5vQnLimLetlS1
-izbOBpveB/8/OD1iYQ31rowpxdKkmU1yMC7Dhh4FsJTq0ukB/7VaL5YTBTRlAgbG
-S8Gu5fIP/k+tKHI7qSkRtZ7w78yA9CxOaD5DXx0HqQQefAOVDxYSsAgLHpzBMXD5
-AEAjaq/jGYOEydc7S5SJq+cJsxRQz3h4I3eOno1+mVKQeEDH7QsCZXGcZbCE7Gbj
-nrlsx89X5cQ0BtryNc0SIH01Regtn+uxFLvK0rvieg6y4g4pex4elDv+vYokTWH2
-a1QROvOmHQiYlb5dk7/i3JlzzLIu43eLgcwxuAb1vHTCUGh3q1IAr+wpqX5FomRw
-wz/Fr3d89z+Zi0MjH94HiBbGbbC0iRKmcfz3wJfl4R+2nvEFn4vdSk7Qg9Mf4hrJ
-V0S12khyqW9/mUstxahLQS19pgq3J+Y85idXqk6iCgHIV6lnSIak7JQYgS+8CsO0
-cHXbxkfk/uUVZJ2vdD7W+f4pMxkUNk5kQkbAp4+2NixgqvpC83HMWgV8Q94zgGNN
-mWnru4ECkRtCMWOgeFrw4yTOyP86i3Kz1xqsrXK2n89Va3Zd/zrCnJ+Y15K1+2WQ
-Tj5uf6bqYEN/WtjD/YJIT//cW1CozfZfijX7Rj/4ZbFQoJtjd9xmdLel4+R5LG9q
-6FijDrkUFcy/n28PHh2yU6ifq0gISGweLOYxnF0EoUG9lbf2A+hc+utj/hBDudG8
-5K+Lu4xXOwnb5rcS7zyMvHxCeMAXnKHAuRjNIHGHkNtRFZXCw+VgWJlz+nKhJk2X
-l+dM0tTfh28wtnDmLPK7/GkLVgGCn98zyJuXkRfw7y50LMXxemgjw7/sMdqiBcwg
-JylAobRi8vkm5NUgcfn14kE+XuWV8xE2QCrdoc/vopSBpt3EkJO/Q4TMAPfJ4HGA
-WyL0XabJXdQW6nBdheE86DW1brwYzv2dIH0VjLCU7FdR+UvxKaY05yJMtkExOzjl
-tjdJRPpcllHH50JUbfzG6/uvdtGxU/slKW1nvP9D7p7k0i60XMcpNOgrqIk=
-=kZGn
+hQEOA6urKKJHvid1EAQA0MchGc7vZsjUgxdII4lo/2jRDesMmLDN4U0uOgExvyhD
+u1OtQBJF8iHgNdDEf8/R3GWhRE94IpVwLqzKTqfVmyKIFd80/Qe4h37TUPpEf8Ex
+f7WaIBk/9OSDNKOkCwZ5OH9xGaorhBwYiTNJlEEGv5zcDte9ZoLO7WhWFfHp3b0E
+AJYk/tf3oV4sJSn8AbUa8UC2tAdpNM1Lx+UEuCtxevYRpWeDVDok7/xuaa/wcb39
+lKyhUV+FBUH++k59K4GVqykOz02hmFl97O+4bAldgP6cVTm0Gh7jwMcJANzhLW/O
+MR5birB+HPKOotMIfhggzxsAt6ESrviIlknkGqwKXWog0ukB/npOqQdu1GmvJqoC
+k6ElA6xZPY5HTF/JLKlLXFfIIKLeuyckKwGDkVNFE7JYPW+dfxcGH9z1KXaNNllY
+V4OKGQh3+gMaoJSY2X7PsmjC4fvi3g6rr360ATr5f82Mr8GPa3x21XLdIFZ04vTe
+yE3kwdcarkiT1QQLnOXk/yRBxJwiA5loL9crVdC2WyOV3B3DG33/yas8krw4BYWw
+DzAgxNtZR4MQXcj83WwoflMo43dYUq3Pk7ZnzKN04O8m9w0gxVxCpXu4ds9emMdJ
+WS4eNTPUOnzeWttkfYcd3SarK6COi9iBosFT2QF80FwDSlH3XdEo7rD1j6WJ5GeX
+RbHDvIm9g0xB23S7jmtfdqIHndvPKLmwW2B1VC1mbjcDUo6pyUb31GBd1zFVhT69
+ijhiEwBlr8uWxROdwJd/7IVIB/RYHLr5P3M8p08hdEdS1IMQbNEE4Y25fRdcc6g8
+fVEAExbG01K1EJhRLxoHzgnAkxDTV2HSwlqbFvKEzUfE+rMHApmSX2lfMvKgueYz
+JpA7nxuf79Wk17bjNvuVQwokhXpzw7FyPPdD7h4Z30LW0ozvSVgs2tigWCAysIKB
+3ZIolchqBoj0ddJgbPXrx09r1oCckEmdj1KtZsci9m+CFA8d22uxXBec0HkEHZpr
+EHlqEZfNTmqowoDtJ8KT+S8VPsALEyDnrqm3s4i44OwgvsPiKOST1xwk6lIJ5isu
+fO76RHTQ2jc8z7+sKyNffVugfjYVRj54/8Gj34QkrVo/42rlvg398tpbAbWuNq8w
+PM//M6eVD4IRDYEGrGOk7prd9mgdbWnOWpasirhr41kePu2vsrIUkJWHmOgdMQDH
+cSSzI8C5NpafROHAhMsUymcJ5dKksvPubh5IAdgtH+m6yDnNUJT8s6WV1f1RpSsQ
+L/n3dhti76l0XtfZ7aST8j46B1JPNDx8+r6Xl9IUbSU=
+=xK46
 -----END PGP MESSAGE-----
--- a/checks/plain-2.asc
+++ b/checks/plain-2.asc
@ -1,33 +1,31 @@
 -----BEGIN PGP MESSAGE-----
-Version: GnuPG v1.2.4rc1 (GNU/Linux)
-Comment: Key available at http://www.jabberwocky.com/david/keys.asc
+Version: GnuPG v1.3.5-cvs (GNU/Linux)

-hQEOAwDZAi05oo3jEAP/TpkKS1vrVTxJtSaCZBcU6zGbGUKC25EGjeLv7GZqND+E
-8mGPH4Ymtu4tdBx+ESZ3eGko+NfUkKW5yCnER4z7usmKiSdxSxaaDoFDx166G5X8
-8/IvEMV0T3p65E16xWog8G4Yjry4VleMR/0NhrHjYmn00FXkwkbz1BnWaHFWFtkD
-+gMkqPLW6Di5V1k5qckuDTHzWgqtPHrepxFlbYSQgJ5sBjGrVO+kKlU3xj5He0fI
-SOVg+QkM+dJfwie/M+MG9vC19sjng8QmnEiP1PX5KECfAR5J6eBf9koWk3yNzcgd
-onfWAGU0shwkr9/qQ0F53jEKu8JAquCAzGxYPYNZ+zug0ukBdgXHQYG0i+fwjjy1
-bMDSMqaaGGzpYsvJaXtMzpx04GDs+K8QOHMOaw5NHTpSlJDc4bYDxLYOYNmStjCH
-mucmopmROfBVGXZnvOF3MYB881rtAALlRj5U1MRZHlZOdq240Owx7sX9e4vENvYv
-AwhI5BTamf/9Rk8RfRG5jvgMcgPcr35Soe8/8mrKOM7hU4Rli4fEIZ6DYhD6rbuS
-UnxtgDOIqrjjt64o3hFkMD8StwBiVqVASAMjAn4SR6FpsADKoRsvjIlm/B//LNUr
-YSppiDVyJESQOyrTMYf9csCevFoVTQjznNNT6vr8wsOIQfNs2gOVBmW26+SNw6qs
-OiA51n0KofKfZgf9+55JiI+bBWimY8RVDA/NIG4XQpdOtC43st7j5/tod1NYsjGz
-jYEFPSHjZyd+hy7fUhyWigM9H2BuyTjNxyOKlYnZQH2HBJLjgrqBGhh3Ul1/fJ2J
-/dO0yVbT/mJCIS/iFKGlgoYC/NCov5FGCVYpDDo19goSiwVI467ho8WQz0boUTTH
-XDkaEZyQXPJW1ttNao4TjQhWSFGoDNmsTpKSNvp7OC6FAO2oMy1cU/VIVYin6amJ
-PqOOJbxk3SrPfcXzH0yWUqNCb/q36tuyMuJvTAs2DrooQMjcGpN/x5JWUyDvV9ij
-ggLUq6veA6AMu3jrdAOEH0m5RsEPkZa6kv2bMGiajXtQAp/gYf4BKT6umBPqvrqt
-3Ay9LXVK2cCGe40bVgoCv73CZ9KjUzrLnTC7Uzdgf/z/OiZq0yva7DVKXolRYrkn
-JcqZvlNXU7XtxBGOm8/z1vCfGddDvsdszAPMUoic5ufowjKeJhlmEtrhL4lKV8SN
-RIPq1FyNN1DEYmd5x8ZeAwekj2Jvb0S6fRGAVOf7IqPE8yp7j3dnQLbqKk70ZrRH
-0/2JeqaDSSzJnSEugnDqJeW7Em4iEpmbxVkCNR9QuJ9dUPuTcbQBu6nrfbofjODH
-UKIiMpQKCSm2LDYAq4au/yBYNOPtD4aiDmWwS/uSS6vGMLPBrSYS8w7e74dFjOTd
-mUa3GRsIq5l7neUke0Px6tcZTWgmCFS2rKgwcOZg7oUsUvvcfuVfNeJ3g34fELaq
-M/kpSPHiAz3Z6Ha7OcqzASOAs8MvbPBAJ6usk6Yi0Z2tk0CjxU3mgziuXcBlD5Gs
-LD6PvmyLClFt3fkMOwzfBVhhwHf9n55bntAhubbzrBLXKpyNReRJmEq3iJqonHMv
-vFSiOmItcZHc3HQa2hD8GTDsDANmYXnULEnWu3zclW9RMPkIafohcYwjooINYkfX
-IKCGjA==
-=vWTp
+hQEOA6urKKJHvid1EAP/aYXFOkxPzbBB0SWtyX+yyvZso8i1WJS3pzrHNXcXQSQx
+xOAfmlCiuXYrjEzlyDAn7k7RLAhUB/ffI58HnbkQ7btWujrHig/V1tQ0j5igR85M
+3y2/msWu2c2pyeZnx29LzeoJ2aMVTbMObszlG+TNOuhCNn4unvbShrkFjNK5fi8E
+AIHiavE77ZPfcaUrXp6FJ6OuhbnJQ8y8CVpH++ddgU6xXK1vByMSsYqiOjfq08gV
+MzqT1eMVvKhSjl3R6Ktl7j+ErYM4KuIofIZsKc8M3JnoTSrLqWSEBq+DEiaSI58i
+SMJfzxfKA84bpJyLIjp4bjRIXveYoX8UjEnSNr3xuDIq0ukBoVe6Bx8lBActcwE+
+kE7EffSBHUmnm8cvwZan+Ms8t9p9aQEzBxV/LfEXZyk36lK35zCH188iJR+tt9zs
+rNubkRuOjq9jAcBtrvgjTTO91Ru7z4RCYeMfnX9AauJZFShBNYN46GTIwqMWE9vq
+B/IYFH9/L2nufcrDQ6u5WxJo0y2FoPqVS4RKEZ4FlKnlT2Op0X1k9w+1nWTtKwQx
+fPsB+YRSKmVbZOXDeKAIVEyGHgR1Hj6pbo/IeHSJ2DJt5OFu6eLQYjxYjM7BPjPD
+Gn+lTUvqw5ykYpCcnvpEx25+qHh5HI11Hi0sLKzvB92hhsQ7+lU2D+iAzsMJKdwE
+u2bCnrZokzZwDBy6NISQ+hoc6NPPezQM4FLN0BB752fa9DYMQo5nEGfPUM7fv51A
+nUdGOmaDVWY54GQxiYzl0JAT41sQSYlVHcWBCGNAm064y+tsHVjDYcf5uze/3Iuw
+m/IbRGLBT7x+j2OqMX30yXoeHCg0/M/2c6vIzhdHEsJjTbTr+M4bMii/mB5kSo/7
+x5R14Lr0mwnPNDFHG2egqd5uL8985+5BENm7q0pQHKGM5NxkjVSWCpzRgKcSEq5A
+x4Q2HbhEJNP6ZonnZkDmGM52Eq62eaR7t8+k9px35osfiTiClmVrjsTgl5Kvatk0
+oL1aYEwp8OtavoSwidUTk+Xb+cEE09P5bnCFs5Js0e5wdo+/izJ6iBuF+PndTh4i
+4ppFmt8/GZ63MKBJu4CZE7QJMVAcmmCrsGRONP2JVgmyaBjrIl5xk9FPXQVY0AJx
+gl3/jO/QFHYs+dlrQ3aqg8Mm0eZyLmZEYjoNibD8PW0keYiVfTF7EGl4jS2sAboc
+AOzbuABa+30vIjJRWeW5UdTcLyNK7B2qWk6dqpRn9ps3cwCWUiTIcIRgot4PY+3M
+8BL4smyZIP1Fmz/woL7gSVIaJHMExHjYPyRlfo+6Vfy3hh3zdiB9e5xA8QRFKgUb
+Px5ShU5bBykfvFBJjgKU1XLBKqdklaudf3+v8F3LPIyuO6vTYzOIU9UKAHy9CrA2
+kAZ8kgHBTtAjmKuJjASBCZHPepq0G9SaRDQI5g4DXx0LXPX3y5xkwVI6kd0QmsMF
+UU4ij/xjzIPN/AxBgQI8HKk56FnaX0JKoHm7mqWa+1TzbuvJjio4J/IN9XXzVqb1
+YL+mkx607hdW9oJltXLO5eio0pb12v/0YXAQlsrlJJNPCUW5hYFv/vH1rHzR98xx
+nx4PXElm8VUuhKDxdVi9Ipo8fL9Amu3PwYonzOck3R2W4wwlmcopVQQ=
+=Ng8B
 -----END PGP MESSAGE-----
--- a/checks/plain-3.asc
+++ b/checks/plain-3.asc
@ -1,14 +1,13 @@
 -----BEGIN PGP MESSAGE-----
-Version: GnuPG v1.2.4rc1 (GNU/Linux)
-Comment: Key available at http://www.jabberwocky.com/david/keys.asc
+Version: GnuPG v1.3.5-cvs (GNU/Linux)

-hQEOAwDZAi05oo3jEAP/RZyGKlqp+9stGNJ0+ctQISmWwsZwvtQGUo9AXGQnZiMh
-zhAT/h0z8pzXQceOV7j/cf1iaHYqLVnkUa9Wipp+oda7EwPNcuodaFX3zkB95Qrg
-/BmmR6+0sjrwbMB+hi3csgrj+aCFTTruKmzJkS+j4YtrYlqf4VkkdFeteWeO3CkD
-/1qALMXO/ruGP7JkrPAqksAoQAWFlFCC7dFyaUKgxV6kCaSgJgIS3MG4pfnI/LNr
-MBcS0jqXFIw8KQFOJbMQVj/dWqty+7ffk6C2A7i+X7A4FyeEm8NmUGro2nL1BYTs
-rZRMHC8PLuP32skmGdrdHh2fv9AYQBy4ufdPUy9L/Umb0mwB3PINTwMlq55vrVUF
-oHxelcPRtA8SPj6o38PEpFh9U5lTAQl2uDMK3yxidoNwd0H0w2UsbTrVgMU0opMH
-8CzXBdbDPoZNi/m3H6HcudWYuJOct3fkChj7ELnyuNiZXGXNlb9VZkWABi3+w70=
-=AURw
+hQEOA6urKKJHvid1EAQAreXx68NPUPpiNhqRyM//Y97N8hX5iAWq3WxXTa8D6Hy9
+81Jy2wI4IeDhHIoWuXMIX2oVL//V1+LyLkrF/tutBVvqct0TUDUWqb4Ydpfk2l5j
+FfSybWW1fS4D1e0KVB3Lfj2Y4cCoT/+zyq7jUKQE++qNefPBzeaRWY4qeI6xXF8E
+AMj01HPe0ZwIBWqiIYv91Q7rGzEZm0ROPilgSQjUvCdsNQGhZpFGTl6uMSU0lmp8
+SD2EKv3xGeo2nMPy/Xp4JoYAMW+fjJh+wM6uT84nJgCVaeWyR7HAfF1U4rzqz7DF
+amPozuwuZiyjoo/wB1irZSl90t5Oa69oMesZtGMvwBN10mMBM0TotT4gjgviv5uY
+kLjD7DM79xy0drptNypmcVcjnDunM6bSEhTyq/fahdaULTYcwSOTXVMyesNpmLCb
+ziayleyuSaXPxIqWTgSfkab/W2FGWZvbexYaSaWXmDqsyzs81o0=
+=JDKF
 -----END PGP MESSAGE-----
--- a/checks/pubring.asc
+++ b/checks/pubring.asc
--- a/checks/secring.asc
+++ b/checks/secring.asc
@ -1,53 +1,73 @@
 This is a test secret keyring simply stored by GNUPG so that it is
 easier to make diff files.

-sec  1024R/2D574CD0 2003-12-05 Test one (pp=def) <one@example.com>
-ssb  1024g/39A28DE3 2003-12-05 
-sec  1024R/2E4BBF50 2003-12-05 Test two (no pp) <two@example.com>
+sec   1024D/D74C5F22 2003-12-31 Test one (pp=def) <one@example.com>
+ssb   1024g/47BE2775 2003-12-31
+
+sec   1024D/C40FDECF 2003-12-31 Test two (no pp) <two@example.com>
+ssb   1024g/B27907AA 2003-12-31
+
+sec   1024R/ECABF51D 2003-12-31 Test three (no pp) <three@example.com>

 -----BEGIN PGP PRIVATE KEY BLOCK-----
-Version: GnuPG v1.2.4rc1 (GNU/Linux)
+Version: GnuPG v1.3.5-cvs (GNU/Linux)

-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
-6BV6BXB2SLkY
-=gop2
+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
+IHWHiQ==
+=52aT
 -----END PGP PRIVATE KEY BLOCK-----
--- a/checks/sigs.test
+++ b/checks/sigs.test
@ -9,15 +9,8 @@ for i in $plain_files $data_files; do
    cmp $i y || error "$i: mismatch"
 done

-# TODO: add the new SHAs here once we allow them to be used in new
-# documents.
-
-hash_algo_list="ripemd160 sha1 md5"
-if have_hash_algo "SHA256"; then
-  hash_algo_list="$hash_algo_list sha256"
-fi
-
-for da in $hash_algo_list ; do
+# Using the DSA sig key - only 160 bit hashes
+for da in ripemd160 sha1 ; do
    for i in $plain_files; do
 	echo "$usrpass1" | $GPG --passphrase-fd 0 --digest-algo $da \
 				-s -o x --yes $i
@ -27,3 +20,24 @@ for da in $hash_algo_list ; do
 	break
    done
 done
+
+# TODO: add the new SHAs here once we allow them to be used in new
+# documents.
+
+if have_cipher_algo "RSA"; then
+    # Using the RSA sig key - all hashes
+    hash_algo_list="ripemd160 sha1 md5"
+    if have_hash_algo "SHA256"; then
+	hash_algo_list="$hash_algo_list sha256"
+    fi
+
+    for da in $hash_algo_list ; do
+	for i in $plain_files; do
+	    $GPG -u $usrkeyid3 --digest-algo $da -s -o x --yes $i
+	    $GPG -o y --yes x
+	    cmp $i y || error "$i: mismatch"
+  	    # process only the first one
+	    break
+	done
+    done
+fi