/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: 2012-11-14 21:03:24 UTC
  • Revision ID: teddy@recompile.se-20121114210324-n7m7k0ki2ncmje3a
* mandos-ctl (string_to_delta): Try to parse RFC 3339 duration before
                                anything else.  This also minimizes
                                the changes from the last release.
  (PGPEngine): Use straight subprocess.Popen() to call "gpg".
* mandos-monitor (UserInterface.run): Fix grammar.

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-2012 Teddy Hogeborn
 
6
# Copyright © 2008-2012 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@recompile.se>.
22
22
# 
23
23
 
24
 
VERSION="1.4.0"
 
24
VERSION="1.6.0"
25
25
 
26
26
KEYDIR="/etc/keys/mandos"
27
27
KEYTYPE=DSA
294
294
            cat "$PASSFILE"
295
295
        else
296
296
            tty --quiet && stty -echo
297
 
            read -p "Enter passphrase: " first
 
297
            echo -n "Enter passphrase: "
 
298
            read first
298
299
            tty --quiet && echo >&2
299
 
            read -p "Repeat passphrase: " second
 
300
            echo -n "Repeat passphrase: "
 
301
            read second
300
302
            if tty --quiet; then
301
303
                echo >&2
302
304
                stty echo