server/admin.c: Remove spurious `ping' in usage message.

[tripe] / keys / tripe-keys.in

diff --git a/keys/tripe-keys.in b/keys/tripe-keys.in
index d95a31d..4ec89e9 100644 (file)
--- a/keys/tripe-keys.in
+++ b/keys/tripe-keys.in
@@ -10,19 +10,18 @@
 ###
 ### This file is part of Trivial IP Encryption (TrIPE).
 ###
-### TrIPE 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 of the License, or
-### (at your option) any later version.
+### TrIPE 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 3 of the License, or (at your
+### option) any later version.
 ###
-### TrIPE 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.
+### TrIPE 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.
 ###
 ### You should have received a copy of the GNU General Public License
-### along with TrIPE; if not, write to the Free Software Foundation,
-### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+### along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
 
 ###--------------------------------------------------------------------------
 ### External dependencies.
@@ -167,7 +166,7 @@ def run(args):
   SYS.stdout.flush()
   rc = OS.spawnvp(OS.P_WAIT, args[0], args)
   if rc != 0:
-    raise SubprocessError, rc
+    raise SubprocessError(rc)
 
 def hexhyphens(bytes):
   """
@@ -218,7 +217,7 @@ def conf_read(f):
     if line[-1] == '\n': line = line[:-1]
     match = rx_keyval.match(line)
     if not match:
-      raise ConfigFileError, "%s:%d: bad line `%s'" % (f, lno, line)
+      raise ConfigFileError("%s:%d: bad line `%s'" % (f, lno, line))
     k, v = match.groups()
     conf[k] = conf_subst(v)
 
@@ -490,7 +489,7 @@ def cmd_update(args):
     ## Verify the signature
     want = C.bytes(rx_nonalpha.sub('', conf['hk-master']))
     got = fingerprint('repos/master.pub', 'master-%d' % seq)
-    if want != got: raise VerifyError
+    if want != got: raise VerifyError()
     run('''catsign -krepos/master.pub verify -avC -kmaster-%d
       -t${sig-fresh} tripe-keys.sig tripe-keys.tar.gz''' % seq)