/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-keygen

  • Committer: Teddy Hogeborn
  • Date: 2013-10-20 15:25:09 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131020152509-zkhuy2yse76w10hg
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
  (purge-server): PID file changed to "/run/mandos.pid".
* debian/compat: Changed to "9".
* debian/control (Standards-Version): Updated to "3.9.4".
  (DM-Upload-Allowed): Removed.
  (mandos/Depends): Add "initscripts (>= 2.88dsf-13.3)" to be able to
                    use the "/run" directory (for mandos.pid).
* debian/copyright (Copyright): Update year.
* init.d-mandos (PIDFILE): Changed to "/run/mandos.pid".
* mandos: Update copyright year.
  (pidfilename): Changed to "/run/mandos.pid".
* mandos-clients.conf.xml (OPTIONS/approval_delay): Bug fix: default
                                                    is "PT0S" - using
                                                    the new RFC 3339
                                                    duration syntax.
* mandos-keygen: Update copyright year.
* mandos-monitor: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
  (FILES): PID file changed to "/run/mandos.pid".
* plugin-runner.c: Update copyright year.
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/plymouth.c: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
64
64
  -l BITS, --length BITS
65
65
                        Key length in bits.  Default is 4096.
66
66
  -s TYPE, --subtype TYPE
67
 
                        Subkey type.  Default is RSA.
 
67
                        Subkey type.  Default is ELG-E.
68
68
  -L BITS, --sublength BITS
69
69
                        Subkey length in bits.  Default is 4096.
70
70
  -n NAME, --name NAME  Name of key.  Default is the FQDN.
204
204
    cat >"$BATCHFILE" <<-EOF
205
205
        Key-Type: $KEYTYPE
206
206
        Key-Length: $KEYLENGTH
207
 
        Key-Usage: sign,auth
 
207
        #Key-Usage: encrypt,sign,auth
208
208
        Subkey-Type: $SUBKEYTYPE
209
209
        Subkey-Length: $SUBKEYLENGTH
210
 
        Subkey-Usage: encrypt
 
210
        #Subkey-Usage: encrypt,sign,auth
211
211
        Name-Real: $KEYNAME
212
212
        $KEYCOMMENTLINE
213
213
        $KEYEMAILLINE
294
294
            cat "$PASSFILE"
295
295
        else
296
296
            tty --quiet && stty -echo
297
 
            echo -n "Enter passphrase: " >&2
 
297
            echo -n "Enter passphrase: "
298
298
            read first
299
299
            tty --quiet && echo >&2
300
 
            echo -n "Repeat passphrase: " >&2
 
300
            echo -n "Repeat passphrase: "
301
301
            read second
302
302
            if tty --quiet; then
303
303
                echo >&2