/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

* debian/watch: Also watch for "*.tar.xz" files.

* plugins.d/plymouth.c (getargv): Use argz_count() and argz_extract().
* plugins.d/usplash.c (main): - '' -

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 -n -e "\nRepeat passphrase: " >&2
 
296
        echo >&2
 
297
        echo -n "Repeat passphrase: " >&2
297
298
        second="$(head --lines=1 | tr --delete '\n')"
298
299
        echo >&2
299
300
        stty echo
300
301
        if [ "$first" != "$second" ]; then
301
 
            echo -e "Passphrase mismatch" >&2
 
302
            echo "Passphrase mismatch" >&2
302
303
            touch "$RINGDIR"/mismatch
303
304
        else
304
305
            echo -n "$first"