mirror of
https://github.com/opnsense/src.git
synced 2026-06-09 00:32:25 -04:00
Restore the RSA host key to /etc/ssh/ssh_host_key.
Also fix $FreeBSD$ spamage in crypto/openssh/sshd_config rev. 1.16.
This commit is contained in:
parent
34da77aac7
commit
d3ebe37cd0
8 changed files with 22 additions and 58 deletions
|
|
@ -1,5 +1,5 @@
|
|||
# $OpenBSD: sshd_config,v 1.38 2001/04/15 21:41:29 deraadt Exp $
|
||||
# $FreeBSD$
|
||||
# $FreeBSD$
|
||||
|
||||
# This is the sshd server system-wide configuration file. See sshd(8)
|
||||
# for more information.
|
||||
|
|
@ -9,7 +9,6 @@ Port 22
|
|||
#ListenAddress 0.0.0.0
|
||||
#ListenAddress ::
|
||||
HostKey /etc/ssh/ssh_host_key
|
||||
HostKey /etc/ssh/ssh_host_rsa_key
|
||||
HostKey /etc/ssh/ssh_host_dsa_key
|
||||
ServerKeyBits 768
|
||||
LoginGraceTime 120
|
||||
|
|
|
|||
|
|
@ -720,14 +720,9 @@ network_pass3() {
|
|||
|
||||
case ${sshd_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
|
||||
if [ -f /etc/ssh/ssh_host_key ]; then
|
||||
/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
|
||||
/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
|
||||
else
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_key ]; then
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
|
||||
echo ' creating ssh DSA host key';
|
||||
|
|
|
|||
|
|
@ -720,14 +720,9 @@ network_pass3() {
|
|||
|
||||
case ${sshd_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
|
||||
if [ -f /etc/ssh/ssh_host_key ]; then
|
||||
/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
|
||||
/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
|
||||
else
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_key ]; then
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
|
||||
echo ' creating ssh DSA host key';
|
||||
|
|
|
|||
|
|
@ -720,14 +720,9 @@ network_pass3() {
|
|||
|
||||
case ${sshd_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
|
||||
if [ -f /etc/ssh/ssh_host_key ]; then
|
||||
/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
|
||||
/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
|
||||
else
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_key ]; then
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
|
||||
echo ' creating ssh DSA host key';
|
||||
|
|
|
|||
|
|
@ -720,14 +720,9 @@ network_pass3() {
|
|||
|
||||
case ${sshd_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
|
||||
if [ -f /etc/ssh/ssh_host_key ]; then
|
||||
/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
|
||||
/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
|
||||
else
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_key ]; then
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
|
||||
echo ' creating ssh DSA host key';
|
||||
|
|
|
|||
|
|
@ -720,14 +720,9 @@ network_pass3() {
|
|||
|
||||
case ${sshd_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
|
||||
if [ -f /etc/ssh/ssh_host_key ]; then
|
||||
/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
|
||||
/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
|
||||
else
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_key ]; then
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
|
||||
echo ' creating ssh DSA host key';
|
||||
|
|
|
|||
|
|
@ -720,14 +720,9 @@ network_pass3() {
|
|||
|
||||
case ${sshd_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
|
||||
if [ -f /etc/ssh/ssh_host_key ]; then
|
||||
/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
|
||||
/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
|
||||
else
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_key ]; then
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
|
||||
echo ' creating ssh DSA host key';
|
||||
|
|
|
|||
|
|
@ -720,14 +720,9 @@ network_pass3() {
|
|||
|
||||
case ${sshd_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
|
||||
if [ -f /etc/ssh/ssh_host_key ]; then
|
||||
/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
|
||||
/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
|
||||
else
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_key ]; then
|
||||
echo ' creating ssh RSA host key';
|
||||
/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
|
||||
fi
|
||||
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
|
||||
echo ' creating ssh DSA host key';
|
||||
|
|
|
|||
Loading…
Reference in a new issue