diff options
author | Damien Miller <djm@mindrot.org> | 2014-01-20 20:07:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-01-20 20:07:15 +1100 |
commit | f9df7f6f477792254eab33cdef71a6d66488cb88 (patch) | |
tree | a2c14292be74f0c0a28372070ef8bcac9178619c /regress/cert-hostkey.sh | |
parent | c74e70eb52ccc0082bd5a70b5798bb01c114d138 (diff) |
- (djm) [regress/cert-hostkey.sh] Fix regress failure on platforms that
skip one or more key types (e.g. RHEL/CentOS 6.5); ok dtucker@
Diffstat (limited to 'regress/cert-hostkey.sh')
-rw-r--r-- | regress/cert-hostkey.sh | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh index 1ed5af501..a1318cd53 100644 --- a/regress/cert-hostkey.sh +++ b/regress/cert-hostkey.sh | |||
@@ -72,32 +72,10 @@ done | |||
72 | printf '@cert-authority ' | 72 | printf '@cert-authority ' |
73 | printf "$HOSTS " | 73 | printf "$HOSTS " |
74 | cat $OBJ/host_ca_key.pub | 74 | cat $OBJ/host_ca_key.pub |
75 | printf '@revoked ' | 75 | for ktype in $PLAIN_TYPES rsa_v00 dsa_v00; do |
76 | printf "* " | 76 | test -f "$OBJ/cert_host_key_${ktype}.pub" || fatal "no pubkey" |
77 | cat $OBJ/cert_host_key_rsa.pub | 77 | printf "@revoked * `cat $OBJ/cert_host_key_${ktype}.pub`\n" |
78 | if test "x$TEST_SSH_ECC" = "xyes"; then | 78 | done |
79 | printf '@revoked ' | ||
80 | printf "* " | ||
81 | cat $OBJ/cert_host_key_ecdsa-sha2-nistp256.pub | ||
82 | printf '@revoked ' | ||
83 | printf "* " | ||
84 | cat $OBJ/cert_host_key_ecdsa-sha2-nistp384.pub | ||
85 | printf '@revoked ' | ||
86 | printf "* " | ||
87 | cat $OBJ/cert_host_key_ecdsa-sha2-nistp521.pub | ||
88 | fi | ||
89 | printf '@revoked ' | ||
90 | printf "* " | ||
91 | cat $OBJ/cert_host_key_ed25519.pub | ||
92 | printf '@revoked ' | ||
93 | printf "* " | ||
94 | cat $OBJ/cert_host_key_dsa.pub | ||
95 | printf '@revoked ' | ||
96 | printf "* " | ||
97 | cat $OBJ/cert_host_key_rsa_v00.pub | ||
98 | printf '@revoked ' | ||
99 | printf "* " | ||
100 | cat $OBJ/cert_host_key_dsa_v00.pub | ||
101 | ) > $OBJ/known_hosts-cert | 79 | ) > $OBJ/known_hosts-cert |
102 | for privsep in yes no ; do | 80 | for privsep in yes no ; do |
103 | for ktype in $PLAIN_TYPES rsa_v00 dsa_v00; do | 81 | for ktype in $PLAIN_TYPES rsa_v00 dsa_v00; do |