[Cvs-cvs] ccvs/src ChangeLog Makefile.in sanity.config.sh...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/06/08 21:06:54

Modified files:
        src            : ChangeLog Makefile.in sanity.config.sh.in 
                         sanity.sh 

Log message:
        * sanity.config.sh.in: Add DEFAULT_SIGN_TEMPLATE &
        DEFAULT_SIGN_TEXTMODE.
        * sanity.sh: Test verification of concatenated signatures.
        (openpgp-5): Skip when only first concatenated signature is reported.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3440&r2=1.3441
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/Makefile.in?cvsroot=cvs&r1=1.168&r2=1.169
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.config.sh.in?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1147&r2=1.1148

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3440
retrieving revision 1.3441
diff -u -b -r1.3440 -r1.3441
--- ChangeLog   8 Jun 2006 20:23:19 -0000       1.3440
+++ ChangeLog   8 Jun 2006 21:06:53 -0000       1.3441
@@ -1,5 +1,10 @@
 2006-06-08  Derek Price  <address@hidden>
 
+       * sanity.config.sh.in: Add DEFAULT_SIGN_TEMPLATE &
+       DEFAULT_SIGN_TEXTMODE.
+       * sanity.sh: Test verification of concatenated signatures.
+       (openpgp-5): Skip when only first concatenated signature is reported.
+
        * sanity.sh: Look for the config file in more places and make it a
        fatal error if an explicitly specified file is not found.
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/Makefile.in,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- Makefile.in 24 Apr 2006 18:50:25 -0000      1.168
+++ Makefile.in 8 Jun 2006 21:06:54 -0000       1.169
@@ -195,6 +195,8 @@
 CPPFLAGS = @CPPFLAGS@
 CSH = @CSH@
 CYGPATH_W = @CYGPATH_W@
+DEFAULT_SIGN_TEMPLATE = @DEFAULT_SIGN_TEMPLATE@
+DEFAULT_SIGN_TEXTMODE = @DEFAULT_SIGN_TEXTMODE@
 DEFAULT_VERIFY_TEMPLATE = @DEFAULT_VERIFY_TEMPLATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@

Index: sanity.config.sh.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.config.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- sanity.config.sh.in 24 Apr 2006 18:50:27 -0000      1.4
+++ sanity.config.sh.in 8 Jun 2006 21:06:54 -0000       1.5
@@ -1,3 +1,17 @@
+# Copyright (C) 2006 The Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
 RSH_DFLT="@RSH_DFLT@"
 GPG="@GPG@"
 DEFAULT_VERIFY_TEMPLATE="@DEFAULT_VERIFY_TEMPLATE@"
+DEFAULT_SIGN_TEMPLATE="@DEFAULT_SIGN_TEMPLATE@"
+DEFAULT_SIGN_TEXTMODE="@DEFAULT_SIGN_TEXTMODE@"

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1147
retrieving revision 1.1148
diff -u -b -r1.1147 -r1.1148
--- sanity.sh   8 Jun 2006 20:23:19 -0000       1.1147
+++ sanity.sh   8 Jun 2006 21:06:54 -0000       1.1148
@@ -1957,6 +1957,40 @@
 F1D6D5842814BC3A264BE7068E0C2C7EF133BDE9:6:
 EOF
 
+  # Very old versions of GPG (1.0.3, at least), only report the first signature
+  # when concatenated signatures are discovered.  Set a var to skip tests that
+  # care.
+  echo whatever >$TESTDIR/signme
+  sign_cmd=`echo $DEFAULT_SIGN_TEMPLATE \
+           |sed -e "s/%t/$DEFAULT_SIGN_TEXTMODE/" \
+                -e s/%a// \
+                -e "s#%s#$TESTDIR/signme#"`
+  $sign_cmd >$TESTDIR/signme.sig 2>>$LOGFILE
+  $sign_cmd >>$TESTDIR/signme.sig 2>>$LOGFILE
+
+  vrfy_cmd=`echo $DEFAULT_VERIFY_TEMPLATE \
+           |sed -e "s/%t/$DEFAULT_SIGN_TEXTMODE/" \
+                -e s/%a// \
+                -e "s#%S#$TESTDIR/signme.sig#" \
+                -e "s#%s#$TESTDIR/signme#"`
+  $vrfy_cmd >$TESTDIR/gpgtmp 2>&1
+  cat $TESTDIR/gpgtmp >>$LOGFILE 2>&1
+  if expr "`cat $TESTDIR/gpgtmp`" : \
+"$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR
+$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR" >/dev/null 2>&1
+  then
+    gpg_reports_multiple_signatures=:
+  else
+    gpg_reports_multiple_signatures=false
+
+    echo "WARNING: Your OpenPGP implementation ($GPG) is very old.  Its" >&2
+    echo "functionality will be tested inasmuch as possible, but, due to" >&2
+    echo "the sensitive nature of OpenPGP implementations, if you intend" >&2
+    echo "to employ OpenPGP commit signatures as a security precaution," >&2
+    echo "we recommend you upgrade to a more recent version." >&2
+  fi
+  rm $TESTDIR/signme* $TESTDIR/gpgtmp
+
   # Some tests check the content of the RCS file and whether there is a
   # signature phrase or not depends on whether they were being generated.
   # The trailing EOL is important.
@@ -33228,9 +33262,13 @@
 
          dotest openpgp-4 "$testcvs sign file1" \
 "$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR"
+         if $gpg_reports_multiple_signatures; then
          dotest openpgp-5 "$testcvs verify file1" \
 "$DOTSTAR Good signature from \"CVS Test Script $DOTSTAR
 $DOTSTAR Good signature from \"CVS Test Script $DOTSTAR"
+         else
+           skip openpgp-5 "GPG only reports the first concatenated signature."
+         fi
 
          dotest openpgp-6 "$testcvs sign -d0xF133BDE9 file1"
          dotest_fail openpgp-7 "$testcvs verify file1" \