@@ -56,7 +56,6 @@ generate_known_hosts_files() {
56
56
57
57
generate_sshd_host_keys () {
58
58
require_executable ssh-keygen
59
- ssh-keygen -N ' ' -t rsa1 -f " ${TMP_DIR} /ssh_host_key" > /dev/null
60
59
ssh-keygen -N ' ' -t dsa -f " ${TMP_DIR} /ssh_host_dsa_key" > /dev/null
61
60
ssh-keygen -N ' ' -t rsa -f " ${TMP_DIR} /ssh_host_rsa_key" > /dev/null
62
61
}
@@ -66,15 +65,15 @@ generate_user_keys() {
66
65
require_executable ssh-keygen
67
66
68
67
# 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
70
69
ssh-add " ${TMP_DIR} /id_rsa" > /dev/null 2>&1
71
70
72
71
# A key to be used for tests to ensure we can pass a passphrase.
73
72
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
75
74
76
75
# 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
78
77
79
78
# Generate authorized_keys
80
79
cat " ${TMP_DIR} /id_rsa.pub" \
@@ -101,7 +100,6 @@ launch_sshd() {
101
100
generate_user_keys
102
101
sshd=$( which sshd)
103
102
${sshd} -f /dev/null \
104
- -h " ${TMP_DIR} /ssh_host_key" \
105
103
-h " ${TMP_DIR} /ssh_host_dsa_key" \
106
104
-h " ${TMP_DIR} /ssh_host_rsa_key" \
107
105
-o " AcceptEnv=*" \
0 commit comments