/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: 2016-03-23 07:14:57 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 343.
  • Revision ID: teddy@recompile.se-20160323071457-2yft5uevmaxwds16
Client: Install intro(8mandos) manual page

When installing client, include the intro(8mandos) manual page so that
it is available even if the server is not installed.

* Makefile (install-client-nokey): Also install intro.8mandos.

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.14"
 
24
VERSION="1.7.7"
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
    
286
285
    esac
287
286
    
288
287
    if [ $SSH -eq 1 ]; then
289
 
        for ssh_keytype in ecdsa-sha2-nistp256 ed25519 rsa; do
 
288
        for ssh_keytype in ed25519 rsa; do
290
289
            set +e
291
290
            ssh_fingerprint="`ssh-keyscan -t $ssh_keytype localhost 2>/dev/null`"
292
291
            set -e
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