/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: 2014-08-06 20:45:04 UTC
  • Revision ID: teddy@recompile.se-20140806204504-lf39wk4ffo9s0ua3
Bug fix for mandos-keygen: Unquote escaped hostname in SSH checker.

%%(host)s is already escaped by re.escape(), and should not be quoted.

* mandos-keygen (password): When printing SSH key fingerprinting
                            checker command of the client config
                            section, do not quote %%(host)s.

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.6.9"
 
24
VERSION="1.6.7"
25
25
 
26
26
KEYDIR="/etc/keys/mandos"
27
27
KEYTYPE=RSA
47
47
    --name "$0" -- "$@"`
48
48
 
49
49
help(){
50
 
basename="`basename "$0"`"
 
50
basename="`basename $0`"
51
51
cat <<EOF
52
52
Usage: $basename [ -v | --version ]
53
53
       $basename [ -h | --help ]
113
113
    esac
114
114
done
115
115
if [ "$#" -gt 0 ]; then
116
 
    echo "Unknown arguments: '$*'" >&2
 
116
    echo "Unknown arguments: '$@'" >&2
117
117
    exit 1
118
118
fi
119
119
 
304
304
    
305
305
    # Get fingerprint of key
306
306
    FINGERPRINT="`gpg --quiet --batch --no-tty --no-options \
307
 
        --enable-dsa2 --homedir "$RINGDIR" --trust-model always \
 
307
        --enable-dsa2 --homedir \"$RINGDIR\" --trust-model always \
308
308
        --fingerprint --with-colons \
309
309
        | sed --quiet \
310
310
        --expression='/^fpr:/{s/^fpr:.*:\\([0-9A-Z]*\\):\$/\\1/p;q}'`"