tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Adapt to extra default verboisity from ssh-keygen when 

searching for and hashing known_hosts entries in a single operation
(ssh-keygen -HF ...) Patch from Anton Kremenetsky

OpenBSD-Regress-ID: 519585a4de35c4611285bd6a7272766c229b19dd
This commit is contained in:
djm@openbsd.org 2018-06-01 03:52:37 +00:00 committed by Damien Miller
parent 76f314c75d
commit a1dcafc41c
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
regress/keygen-knownhosts.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: keygen-knownhosts.sh,v 1.3 2015/07/17 03:34:27 djm Exp $ # $OpenBSD: keygen-knownhosts.sh,v 1.4 2018/06/01 03:52:37 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="ssh-keygen known_hosts" tid="ssh-keygen known_hosts"
@ -55,13 +55,24 @@ expect_key() {
check_find() { check_find() {
_host=$1 _host=$1
_name=$2 _name=$2
_keygenopt=$3 shift; shift
${SSHKEYGEN} $_keygenopt -f $OBJ/kh.invalid -F $_host > $OBJ/kh.result ${SSHKEYGEN} "$@" -f $OBJ/kh.invalid -F $_host > $OBJ/kh.result
if ! diff -w $OBJ/kh.expect $OBJ/kh.result ; then if ! diff -w $OBJ/kh.expect $OBJ/kh.result ; then
fail "didn't find $_name" fail "didn't find $_name"
fi fi
} }
check_find_exit_code() {
_host=$1
_name=$2
_keygenopt=$3
_exp_exit_code=$4
${SSHKEYGEN} $_keygenopt -f $OBJ/kh.invalid -F $_host > /dev/null
if [ "$?" != "$_exp_exit_code" ] ; then
fail "Unexpected exit code $_name"
fi
}
# Find key # Find key
rm -f $OBJ/kh.expect rm -f $OBJ/kh.expect
expect_key host-a host-a host-a 2 expect_key host-a host-a host-a 2
@ -88,6 +99,18 @@ rm -f $OBJ/kh.expect
expect_key host-h "host-f,host-g,host-h " host-f 17 expect_key host-h "host-f,host-g,host-h " host-f 17
check_find host-h "find multiple hosts" check_find host-h "find multiple hosts"
# Check exit code, known host
check_find_exit_code host-a "known host" "-q" "0"
# Check exit code, unknown host
check_find_exit_code host-aa "unknown host" "-q" "1"
# Check exit code, the hash mode, known host
check_find_exit_code host-a "known host" "-q -H" "0"
# Check exit code, the hash mode, unknown host
check_find_exit_code host-aa "unknown host" "-q -H" "1"
check_hashed_find() { check_hashed_find() {
_host=$1 _host=$1
_name=$2 _name=$2
@ -110,19 +133,19 @@ check_hashed_find host-a "find simple and hash"
rm -f $OBJ/kh.expect rm -f $OBJ/kh.expect
expect_key host-c host-c host-c "" CA expect_key host-c host-c host-c "" CA
# CA key output is not hashed. # CA key output is not hashed.
check_find host-c "find simple and hash" -H check_find host-c "find simple and hash" -Hq
# Find revoked key and hash # Find revoked key and hash
rm -f $OBJ/kh.expect rm -f $OBJ/kh.expect
expect_key host-d host-d host-d "" REVOKED expect_key host-d host-d host-d "" REVOKED
# Revoked key output is not hashed. # Revoked key output is not hashed.
check_find host-d "find simple and hash" -H check_find host-d "find simple and hash" -Hq
# find key with wildcard and hash # find key with wildcard and hash
rm -f $OBJ/kh.expect rm -f $OBJ/kh.expect
expect_key host-e "host-e*" host-e "" expect_key host-e "host-e*" host-e ""
# Key with wildcard hostname should not be hashed. # Key with wildcard hostname should not be hashed.
check_find host-e "find wildcard key" -H check_find host-e "find wildcard key" -Hq
# find key among multiple hosts # find key among multiple hosts
rm -f $OBJ/kh.expect rm -f $OBJ/kh.expect