/mandos/trunk : revision 725

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-07-25 23:54:03 UTC
Revision ID: teddy@recompile.se-20140725235403-8sx708g7rosge1ei

Bug fix to allow Python 3; that is, version 3 of the "python" package.

* debian/control (Package: mandos/Depends): Bug fix: Change from
                                            "python (<= 2.7)" to
                                            "python (>= 2.7)",
                                            allowing "/usr/bin/python"
                                            to be Python 3.

Show diffs side-by-side

added added

removed removed

mandos-keygen

# Contact the authors at <mandos@recompile.se>.

VERSION="1.6.9"

VERSION="1.6.7"

KEYDIR="/etc/keys/mandos"

KEYTYPE=RSA

--name "$0" -- "$@"`

help(){

basename="`basename "$0"`"

basename="`basename $0`"

cat <<EOF

Usage: $basename [ -v | --version ]

$basename [ -h | --help ]

113

esac

114

done

115

if [ "$#" -gt 0 ]; then

116

echo "Unknown arguments: '$*'" >&2

116

echo "Unknown arguments: '$@'" >&2

117

exit 1

118

119

304

305

# Get fingerprint of key

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

--fingerprint --with-colons \

309

| sed --quiet \

310

--expression='/^fpr:/{s/^fpr:.*:\$[0-9A-Z]*\$:\$/\\1/p;q}'`"

363

}

364

}' < "$SECFILE"

365

if [ -n "$ssh_fingerprint" ]; then

366

echo 'checker = ssh-keyscan %%(host)s 2>/dev/null | grep --fixed-strings --line-regexp --quiet --regexp=%%(host)s" %(ssh_fingerprint)s"'

366

echo 'checker = ssh-keyscan %%(host)s 2>/dev/null | grep --fixed-strings --line-regexp --quiet --regexp="%%(host)s %(ssh_fingerprint)s"'

367

echo "ssh_fingerprint = ${ssh_fingerprint}"

368

369

Older »