svn commit: r397771 - in head/security/openssh-portable: . files
Bryan Drewery
bdrewery at FreeBSD.org
Thu Sep 24 21:54:41 UTC 2015
Author: bdrewery
Date: Thu Sep 24 21:54:40 2015
New Revision: 397771
URL: https://svnweb.freebsd.org/changeset/ports/397771
Log:
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 at chrysalisnet.org [1]
Modified:
head/security/openssh-portable/Makefile
head/security/openssh-portable/files/openssh.in
Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile Thu Sep 24 21:54:29 2015 (r397770)
+++ head/security/openssh-portable/Makefile Thu Sep 24 21:54:40 2015 (r397771)
@@ -3,7 +3,7 @@
PORTNAME= openssh
DISTVERSION= 7.1p1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= security ipv6
MASTER_SITES= OPENBSD/OpenSSH/portable
Modified: head/security/openssh-portable/files/openssh.in
==============================================================================
--- head/security/openssh-portable/files/openssh.in Thu Sep 24 21:54:29 2015 (r397770)
+++ head/security/openssh-portable/files/openssh.in Thu Sep 24 21:54:40 2015 (r397771)
@@ -35,8 +35,7 @@ pidfile=${openssh_pidfile:="/var/run/ssh
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"
More information about the svn-ports-all
mailing list