Skip to content

Commit 6c19e03

Browse files
committed
RSA1 keys are no longer supported
Also, we need to output keys in PEM format or else libssh2 will choke on them.
1 parent 9ec1f45 commit 6c19e03

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

test/script/setup.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ generate_known_hosts_files() {
5656

5757
generate_sshd_host_keys() {
5858
require_executable ssh-keygen
59-
ssh-keygen -N '' -t rsa1 -f "${TMP_DIR}/ssh_host_key" > /dev/null
6059
ssh-keygen -N '' -t dsa -f "${TMP_DIR}/ssh_host_dsa_key" > /dev/null
6160
ssh-keygen -N '' -t rsa -f "${TMP_DIR}/ssh_host_rsa_key" > /dev/null
6261
}
@@ -66,15 +65,15 @@ generate_user_keys() {
6665
require_executable ssh-keygen
6766

6867
# The key to be used for most tests.
69-
ssh-keygen -N '' -t rsa -f "${TMP_DIR}/id_rsa" > /dev/null
68+
ssh-keygen -N '' -t rsa -m pem -f "${TMP_DIR}/id_rsa" > /dev/null
7069
ssh-add "${TMP_DIR}/id_rsa" > /dev/null 2>&1
7170

7271
# A key to be used for tests to ensure we can pass a passphrase.
7372
ssh-keygen -N 'correct horse battery staple' \
74-
-t rsa -f "${TMP_DIR}/id_rsa_with_passphrase" > /dev/null
73+
-t rsa -m pem -f "${TMP_DIR}/id_rsa_with_passphrase" > /dev/null
7574

7675
# A key that will never be in authorized_keys.
77-
ssh-keygen -N '' -t rsa -f "${TMP_DIR}/id_rsa_never_authorised" > /dev/null
76+
ssh-keygen -N '' -t rsa -m pem -f "${TMP_DIR}/id_rsa_never_authorised" > /dev/null
7877

7978
# Generate authorized_keys
8079
cat "${TMP_DIR}/id_rsa.pub" \
@@ -101,7 +100,6 @@ launch_sshd() {
101100
generate_user_keys
102101
sshd=$(which sshd)
103102
${sshd} -f /dev/null \
104-
-h "${TMP_DIR}/ssh_host_key" \
105103
-h "${TMP_DIR}/ssh_host_dsa_key" \
106104
-h "${TMP_DIR}/ssh_host_rsa_key" \
107105
-o "AcceptEnv=*" \

0 commit comments

Comments
 (0)