/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: 2009-09-21 21:39:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090921213925-jbpt6tzu99otseng
Use D-Bus properties instead of our own methods.

* mandos (Client._datetime_to_milliseconds): Renamed to
                                             "_timedelta_to_milliseconds".
                                             All callers changed.
  (dbus_service_property): New decorator for D-Bus properties.
  (DBusPropertyException, DBusPropertyAccessException,
  DBusPropertyNotFound): New D-Bus exception classes.
  (DBusObjectWithProperties): New; extends "dbus.service.Object" with
                              support for properties.
  (ClientDBus): Inherit from, and call up to, "DBusObjectWithProperties".
  (ClientDBus.CheckedOK, ClientDBus.GetAllProperties,
  ClientDBus.SetChecker, ClientDBus.SetHost, ClientDBus.SetInterval,
  ClientDBus.SetSecret, ClientDBus.SetTimeout, ClientDBus.Enable,
  ClientDBus.StartChecker, ClientDBus.Disable,
  ClientDBus.StopChecker): Removed, replaced with properties.
  (ClientDBus.IsStillValid): Removed, superfluous.
  (ClientDBus.name_dbus_property,
  ClientDBus.fingerprint_dbus_property, ClientDBus.host_dbus_property,
  ClientDBus.created_dbus_property,
  ClientDBus.last_enabled_dbus_property,
  ClientDBus.enabled_dbus_property,
  ClientDBus.last_checked_ok_dbus_property,
  ClientDBus.timeout_dbus_property, ClientDBus.interval_dbus_property,
  ClientDBus.checker_dbus_property,
  ClientDBus.checker_running_dbus_property,
  ClientDBus.object_path_dbus_property,
  ClientDBus.secret_dbus_property): New D-Bus properties.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen
2
2
# 
3
3
# Mandos key generator - create a new OpenPGP key for a Mandos client
4
4
# 
5
 
# Copyright © 2008-2011 Teddy Hogeborn
6
 
# Copyright © 2008-2011 Björn Påhlsson
 
5
# Copyright © 2008,2009 Teddy Hogeborn
 
6
# Copyright © 2008,2009 Björn Påhlsson
7
7
# 
8
8
# This program is free software: you can redistribute it and/or modify
9
9
# it under the terms of the GNU General Public License as published by
21
21
# Contact the authors at <mandos@fukt.bsnet.se>.
22
22
# 
23
23
 
24
 
VERSION="1.3.1"
 
24
VERSION="1.0.12"
25
25
 
26
26
KEYDIR="/etc/keys/mandos"
27
27
KEYTYPE=DSA
195
195
stty echo; \
196
196
" EXIT
197
197
 
198
 
set -e
199
 
 
200
198
umask 077
201
199
 
202
200
if [ "$mode" = keygen ]; then
219
217
        %commit
220
218
        EOF
221
219
    
222
 
    if tty --quiet; then
223
 
        cat <<-EOF
224
 
        Note: Due to entropy requirements, key generation could take
225
 
        anything from a few minutes to SEVERAL HOURS.  Please be
226
 
        patient and/or supply the system with more entropy if needed.
227
 
        EOF
228
 
        echo -n "Started: "
229
 
        date
230
 
    fi
231
 
    
232
220
    # Generate a new key in the key rings
233
221
    gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
234
222
        --homedir "$RINGDIR" --trust-model always \
235
223
        --gen-key "$BATCHFILE"
236
224
    rm --force "$BATCHFILE"
237
225
    
238
 
    if tty --quiet; then
239
 
        echo -n "Finished: "
240
 
        date
241
 
    fi
242
 
    
243
226
    # Backup any old key files
244
227
    if cp --backup=numbered --force "$SECKEYFILE" "$SECKEYFILE" \
245
228
        2>/dev/null; then
295
278
        stty -echo
296
279
        echo -n "Enter passphrase: " >&2
297
280
        first="$(head --lines=1 | tr --delete '\n')"
298
 
        echo >&2
299
 
        echo -n "Repeat passphrase: " >&2
 
281
        echo -n -e "\nRepeat passphrase: " >&2
300
282
        second="$(head --lines=1 | tr --delete '\n')"
301
283
        echo >&2
302
284
        stty echo
303
285
        if [ "$first" != "$second" ]; then
304
 
            echo "Passphrase mismatch" >&2
 
286
            echo -e "Passphrase mismatch" >&2
305
287
            touch "$RINGDIR"/mismatch
306
288
        else
307
289
            echo -n "$first"