/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-keygen

  • Committer: Teddy Hogeborn
  • Date: 2008-12-15 02:33:36 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081215023336-x319cdr0ycvrzp33
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
                                     return a dbus.String containing
                                     an ISO 8601 formatted date+time.
  (Client.__init__): Renamed keyword argument "stop_hook" to
                     "disabled_hook".  All callers changed.
  (Client.started): Renamed to "enabled"; all users changed.
  (Client.last_started): Renamed to "last_enabled"; all users changed.
  (Client.stop_hook): Renamed to "disabled_hook"; all users changed.
  (Client.stop_initiator_tag): Renamed to "disable_initiator_tag"; all
                               users changed.
  (Client.start): Renamed to "enable".  All callers changed.
  (Client.stop): Renamed to "disable".  All callers changed.
  (Client.GetAllProperties): Property "last_started" renamed to
                             "last_enabled" and "started" renamed to
                             "enabled".
  (Client.Start): Renamed to "Enable".
  (Client.Stop): Renamed to "Disable".

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
3
3
# Mandos key generator - create a new OpenPGP key for a Mandos client
4
4
5
 
# Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
 
5
# Copyright © 2008 Teddy Hogeborn
 
6
# Copyright © 2008 Björn Påhlsson
6
7
7
8
# This program is free software: you can redistribute it and/or modify
8
9
# it under the terms of the GNU General Public License as published by
20
21
# Contact the authors at <mandos@fukt.bsnet.se>.
21
22
22
23
 
23
 
VERSION="1.0"
 
24
VERSION="1.0.2"
24
25
 
25
26
KEYDIR="/etc/keys/mandos"
26
27
KEYTYPE=DSA
289
290
        fi
290
291
    fi | gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
291
292
        --homedir "$RINGDIR" --trust-model always --armor --encrypt \
292
 
        --recipient "$FINGERPRINT" --comment "$FILECOMMENT" \
 
293
        --sign --recipient "$FINGERPRINT" --comment "$FILECOMMENT" \
293
294
        > "$SECFILE"
294
295
    status="${PIPESTATUS[0]}"
295
296
    if [ "$status" -ne 0 ]; then