/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: 2016-06-27 20:21:50 UTC
  • Revision ID: teddy@recompile.se-20160627202150-ml201ilxwjf1g29w
mandos-ctl: Implement --dump-json option

* mandos-ctl (main): Implement --dump-json option
* mandos-ctl.xml (NAME, DESCRIPTION): Change description to the more
                                      accurate "control or query".
  (SYNOPSIS): Add required group around action options and add new
              "--dump-json" option.
  (OPTIONS): Document new "--dump-json" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen
21
21
# Contact the authors at <mandos@recompile.se>.
22
22
# 
23
23
 
24
 
VERSION="1.7.13"
 
24
VERSION="1.7.10"
25
25
 
26
26
KEYDIR="/etc/keys/mandos"
27
27
KEYTYPE=RSA
218
218
        #Handle: <no-spaces>
219
219
        #%pubring pubring.gpg
220
220
        #%secring secring.gpg
221
 
        %no-protection
222
221
        %commit
223
222
        EOF
224
223
    
325
324
            cat "$PASSFILE"
326
325
        else
327
326
            tty --quiet && stty -echo
328
 
            echo -n "Enter passphrase: " >/dev/tty
 
327
            echo -n "Enter passphrase: " >&2
329
328
            read first
330
329
            tty --quiet && echo >&2
331
 
            echo -n "Repeat passphrase: " >/dev/tty
 
330
            echo -n "Repeat passphrase: " >&2
332
331
            read second
333
332
            if tty --quiet; then
334
333
                echo >&2