/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: 2009-10-30 16:23:43 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091030162343-1p2a8bf3gc084kc9
* plugins.d/password-prompt.c: Use environment variables and prompt
                               text from cryptsetup 1.1.
* plugins.d/password-prompt.xml (ENVIRONMENT): Document change in
                                               environment variables
                                               used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen
278
278
    
279
279
    # Get fingerprint of key
280
280
    FINGERPRINT="`gpg --quiet --batch --no-tty --no-options \
281
 
        --enable-dsa2 --homedir \"$RINGDIR\" --trust-model always \
 
281
        --enable-dsa2 --homedir '"'$RINGDIR'"' --trust-model always \
282
282
        --fingerprint --with-colons \
283
283
        | sed --quiet \
284
284
        --expression='/^fpr:/{s/^fpr:.*:\\([0-9A-Z]*\\):\$/\\1/p;q}'`"
293
293
        stty -echo
294
294
        echo -n "Enter passphrase: " >&2
295
295
        first="$(head --lines=1 | tr --delete '\n')"
296
 
        echo >&2
297
 
        echo -n "Repeat passphrase: " >&2
 
296
        echo -n -e "\nRepeat passphrase: " >&2
298
297
        second="$(head --lines=1 | tr --delete '\n')"
299
298
        echo >&2
300
299
        stty echo
301
300
        if [ "$first" != "$second" ]; then
302
 
            echo "Passphrase mismatch" >&2
 
301
            echo -e "Passphrase mismatch" >&2
303
302
            touch "$RINGDIR"/mismatch
304
303
        else
305
304
            echo -n "$first"