[patch/Cygwin]: Simplify host key generation in ssh-host-config script

[Corinna Vinschen]

Ping?


I sent this patch 5 weeks before 6.3 has been announced and it's still
not in 6.4, unfortunately.  Any chance this could be applied soon?


Thanks,
Corinna


On Aug  5 14:01, Corinna Vinschen wrote:
> Hi,
> 
> as the subject says, the below patch just simplifies the host
> key generation in the Cygwin-specific ssh-host-config script.
> Rather than testing and generating each key, call ssh-keygen -A.
> 
> Could somebody with checkin rights please apply?
> 
> 
> Thanks,
> Corinna
> 
> 
> Index: contrib/cygwin/ssh-host-config
> ===================================================================
> RCS file: /cvs/openssh/contrib/cygwin/ssh-host-config,v
> retrieving revision 1.33
> diff -u -p -r1.33 ssh-host-config
> --- contrib/cygwin/ssh-host-config	2 Jul 2013 10:06:47 -0000	1.33
> +++ contrib/cygwin/ssh-host-config	5 Aug 2013 12:00:39 -0000
> @@ -68,54 +68,6 @@ password_value=
>  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 @@ then
>    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
> 
> 
> -- 
> Corinna Vinschen
> Cygwin Maintainer
> Red Hat
> _______________________________________________
> openssh-unix-dev mailing list
> openssh-unix-dev at mindrot.org
> https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev

-- 
Corinna Vinschen
Cygwin Maintainer
Red Hat
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.mindrot.org/pipermail/openssh-unix-dev/attachments/20131108/66f3de52/attachment.bin>