diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | regress/cert-hostkey.sh | 8 |
2 files changed, 6 insertions, 3 deletions
@@ -48,6 +48,7 @@ | |||
48 | - (djm) [ed25519.c ssh-ed25519.c openbsd-compat/Makefile.in] | 48 | - (djm) [ed25519.c ssh-ed25519.c openbsd-compat/Makefile.in] |
49 | [openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on | 49 | [openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on |
50 | Linux | 50 | Linux |
51 | - (djm) [regress/cert-hostkey.sh] Fix merge botch | ||
51 | 52 | ||
52 | 20131205 | 53 | 20131205 |
53 | - (djm) OpenBSD CVS Sync | 54 | - (djm) OpenBSD CVS Sync |
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh index da2cec87d..1ed5af501 100644 --- a/regress/cert-hostkey.sh +++ b/regress/cert-hostkey.sh | |||
@@ -76,6 +76,8 @@ done | |||
76 | printf "* " | 76 | printf "* " |
77 | cat $OBJ/cert_host_key_rsa.pub | 77 | cat $OBJ/cert_host_key_rsa.pub |
78 | if test "x$TEST_SSH_ECC" = "xyes"; then | 78 | if test "x$TEST_SSH_ECC" = "xyes"; then |
79 | printf '@revoked ' | ||
80 | printf "* " | ||
79 | cat $OBJ/cert_host_key_ecdsa-sha2-nistp256.pub | 81 | cat $OBJ/cert_host_key_ecdsa-sha2-nistp256.pub |
80 | printf '@revoked ' | 82 | printf '@revoked ' |
81 | printf "* " | 83 | printf "* " |
@@ -83,12 +85,12 @@ done | |||
83 | printf '@revoked ' | 85 | printf '@revoked ' |
84 | printf "* " | 86 | printf "* " |
85 | cat $OBJ/cert_host_key_ecdsa-sha2-nistp521.pub | 87 | cat $OBJ/cert_host_key_ecdsa-sha2-nistp521.pub |
86 | printf '@revoked ' | ||
87 | printf "* " | ||
88 | cat $OBJ/cert_host_key_ed25519.pub | ||
89 | fi | 88 | fi |
90 | printf '@revoked ' | 89 | printf '@revoked ' |
91 | printf "* " | 90 | printf "* " |
91 | cat $OBJ/cert_host_key_ed25519.pub | ||
92 | printf '@revoked ' | ||
93 | printf "* " | ||
92 | cat $OBJ/cert_host_key_dsa.pub | 94 | cat $OBJ/cert_host_key_dsa.pub |
93 | printf '@revoked ' | 95 | printf '@revoked ' |
94 | printf "* " | 96 | printf "* " |