diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-09-25 05:54:40 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-09-25 05:54:40 +0800 |
| commit | 69827cec24e21f4bc11ae3ee1f649793eb752d53 (patch) | |
| tree | 24487c809f4f54459e6f6d940364b59a47ae1a3c /security/openssh-portable | |
| parent | 64a0dae5ad85248b5017f5a1ac03f6512ee5ed21 (diff) | |
| download | freebsd-ports-gnome-69827cec24e21f4bc11ae3ee1f649793eb752d53.tar.gz freebsd-ports-gnome-69827cec24e21f4bc11ae3ee1f649793eb752d53.tar.zst freebsd-ports-gnome-69827cec24e21f4bc11ae3ee1f649793eb752d53.zip | |
Stop trying to create the RSA protocol 1 key from the rc.d file. It is no
longer supported by default since 7.0. [1]
I do plan to make this configurable based on PR 202169 [2] soon.
PR: 202792 [1]
PR: 202169 [2]
Submitted by: chrysalis@chrysalisnet.org [1]
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh-portable/files/openssh.in | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index b1910b833447..8053cc7b5099 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 7.1p1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable diff --git a/security/openssh-portable/files/openssh.in b/security/openssh-portable/files/openssh.in index 230179312af1..801d7145118b 100644 --- a/security/openssh-portable/files/openssh.in +++ b/security/openssh-portable/files/openssh.in @@ -35,8 +35,7 @@ pidfile=${openssh_pidfile:="/var/run/sshd.pid"} openssh_keygen() { - if [ -f %%ETCDIR%%/ssh_host_key -a \ - -f %%ETCDIR%%/ssh_host_dsa_key -a \ + if [ -f %%ETCDIR%%/ssh_host_dsa_key -a \ -f %%ETCDIR%%/ssh_host_rsa_key -a \ -f %%ETCDIR%%/ssh_host_ecdsa_key -a \ -f %%ETCDIR%%/ssh_host_ed25519_key ]; then @@ -49,15 +48,6 @@ openssh_keygen() [ -x %%PREFIX%%/bin/ssh-keygen ] || err 1 "%%PREFIX%%/bin/ssh-keygen does not exist." - if [ -f %%ETCDIR%%/ssh_host_key ]; then - echo "You already have an RSA host key" \ - "in %%ETCDIR%%/ssh_host_key" - echo "Skipping protocol version 1 RSA Key Generation" - else - %%PREFIX%%/bin/ssh-keygen -t rsa1 -b 1024 \ - -f %%ETCDIR%%/ssh_host_key -N '' - fi - if [ -f %%ETCDIR%%/ssh_host_dsa_key ]; then echo "You already have a DSA host key" \ "in %%ETCDIR%%/ssh_host_dsa_key" |