/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-10-08 04:24:29 UTC
  • mfrom: (880 trunk)
  • mto: This revision was merged to the branch mainline in revision 881.
  • Revision ID: teddy@recompile.se-20161008042429-xn41ls94f91ny3ba
Merge from trunk

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.3"
 
24
VERSION="1.7.12"
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
221
222
        %commit
222
223
        EOF
223
224
    
285
286
    esac
286
287
    
287
288
    if [ $SSH -eq 1 ]; then
288
 
        for ssh_keytype in ed25519 rsa; do
 
289
        for ssh_keytype in ecdsa-sha2-nistp256 ed25519 rsa; do
289
290
            set +e
290
291
            ssh_fingerprint="`ssh-keyscan -t $ssh_keytype localhost 2>/dev/null`"
291
292
            set -e
324
325
            cat "$PASSFILE"
325
326
        else
326
327
            tty --quiet && stty -echo
327
 
            echo -n "Enter passphrase: " >&2
 
328
            echo -n "Enter passphrase: " >/dev/tty
328
329
            read first
329
330
            tty --quiet && echo >&2
330
 
            echo -n "Repeat passphrase: " >&2
 
331
            echo -n "Repeat passphrase: " >/dev/tty
331
332
            read second
332
333
            if tty --quiet; then
333
334
                echo >&2