- (dtucker) [contrib/cygwin/ssh-host-config] Simplify host key generation:
rather than testing and generating each key, call ssh-keygen -A.
Patch from vinschen at redhat.com.
diff --git a/ChangeLog b/ChangeLog
index 72c53f7..7372ad2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,8 +27,11 @@
- (dtucker) [openbsd-compat/bsd-poll.c] Add headers to prevent compile
warnings.
- (dtucker) [Makefile.in configure.ac] Set MALLOC_OPTIONS per platform
- and pass in TEST_ENV. Unknown options cause stderr to get polluted
+ and pass in TEST_ENV. use stderr to get polluted
and the stderr-data test to fail.
+ - (dtucker) [contrib/cygwin/ssh-host-config] Simplify host key generation:
+ rather than testing and generating each key, call ssh-keygen -A.
+ Patch from vinschen at redhat.com.
20131107
- (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index c542d5c..05efd3b 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -68,54 +68,6 @@
opt_force=no
# ======================================================================
-# Routine: create_host_keys
-# ======================================================================
-create_host_keys() {
- local ret=0
-
- if [ ! -f "${SYSCONFDIR}/ssh_host_key" ]
- then
- csih_inform "Generating ${SYSCONFDIR}/ssh_host_key"
- if ! /usr/bin/ssh-keygen -t rsa1 -f ${SYSCONFDIR}/ssh_host_key -N '' > /dev/null
- then
- csih_warning "Generating ${SYSCONFDIR}/ssh_host_key failed!"
- let ++ret
- fi
- fi
-
- if [ ! -f "${SYSCONFDIR}/ssh_host_rsa_key" ]
- then
- csih_inform "Generating ${SYSCONFDIR}/ssh_host_rsa_key"
- if ! /usr/bin/ssh-keygen -t rsa -f ${SYSCONFDIR}/ssh_host_rsa_key -N '' > /dev/null
- then
- csih_warning "Generating ${SYSCONFDIR}/ssh_host_key failed!"
- let ++ret
- fi
- fi
-
- if [ ! -f "${SYSCONFDIR}/ssh_host_dsa_key" ]
- then
- csih_inform "Generating ${SYSCONFDIR}/ssh_host_dsa_key"
- if ! /usr/bin/ssh-keygen -t dsa -f ${SYSCONFDIR}/ssh_host_dsa_key -N '' > /dev/null
- then
- csih_warning "Generating ${SYSCONFDIR}/ssh_host_key failed!"
- let ++ret
- fi
- fi
-
- if [ ! -f "${SYSCONFDIR}/ssh_host_ecdsa_key" ]
- then
- csih_inform "Generating ${SYSCONFDIR}/ssh_host_ecdsa_key"
- if ! /usr/bin/ssh-keygen -t ecdsa -f ${SYSCONFDIR}/ssh_host_ecdsa_key -N '' > /dev/null
- then
- csih_warning "Generating ${SYSCONFDIR}/ssh_host_key failed!"
- let ++ret
- fi
- fi
- return $ret
-} # --- End of create_host_keys --- #
-
-# ======================================================================
# Routine: update_services_file
# ======================================================================
update_services_file() {
@@ -719,8 +671,8 @@
let ++warning_cnt
fi
-# host keys
-create_host_keys || let warning_cnt+=$?
+# generate missing host keys
+/usr/bin/ssh-keygen -A || let warning_cnt+=$?
# handle ssh_config
csih_install_config "${SYSCONFDIR}/ssh_config" "${SYSCONFDIR}/defaults" || let ++warning_cnt