X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=sign.sh;h=bdf6245ff95653a898c06e0805e00732ed5cc984;hb=refs%2Fheads%2F0.68%2Bkerberos-fix;hp=2d348aa3905b8af9be68be671ccaaf31bc25d7d9;hpb=c8f2b65d166047d0bad013a73003e7e057792d15;p=PuTTY.git

diff --git a/sign.sh b/sign.sh
index 2d348aa3..bdf6245f 100755
--- a/sign.sh
+++ b/sign.sh
@@ -3,29 +3,33 @@
 # Generate GPG signatures on a PuTTY release/snapshot directory as
 # delivered by Buildscr.
 
-# Usage: sh sign.sh <builddir> <keytype>
-# e.g.   sh sign.sh putty Snapshots  (probably in the build.out directory)
-#   or   sh sign.sh 0.60 Releases
+# Usage: sh sign.sh [-r] <builddir>
+# e.g.   sh sign.sh putty              (probably in the build.out directory)
+#   or   sh sign.sh -r 0.60            (-r means use the release keys)
 
 set -e
 
+keyname=EEF20295D15F7E8A
+
+if test "x$1" = "x-r"; then
+    shift
+    keyname=9DFE2648B43434E4
+fi
+
 sign() {
   # Check for the prior existence of the signature, so we can
   # re-run this script if it encounters an error part way
   # through.
-  echo "----- Signing $2 with '$keyname'"
+  echo "----- Signing $2 with key '$keyname'"
   test -f "$3" || \
     gpg --load-extension=idea "$1" -u "$keyname" -o "$3" "$2"
 }
 
 cd "$1"
-for t in DSA RSA; do
-  keyname="$2 ($t)"
-  echo "===== Signing with '$keyname'"
-  for i in putty*src.zip putty*.tar.gz x86/*.exe x86/*.zip; do
-    sign --detach-sign "$i" "$i.$t"
-  done
-  for i in md5sums sha1sums sha256sums sha512sums; do
-    sign --clearsign $i ${i}.$t
-  done
+echo "===== Signing with key '$keyname'"
+for i in putty*src.zip putty*.tar.gz w32/*.exe w32/*.zip w32/*.msi w64/*.exe w64/*.zip w64/*.msi w32old/*.exe w32old/*.zip; do
+    sign --detach-sign "$i" "$i.gpg"
+done
+for i in md5sums sha1sums sha256sums sha512sums; do
+    sign --clearsign "$i" "$i.gpg"
 done