Просмотр исходного кода

openssh: update to 10.3p1, add ecdsa and ed25519 key generation

Waldemar Brodkorb 3 дней назад
Родитель
Сommit
2f1034c940
2 измененных файлов с 26 добавлено и 2 удалено
  1. 2 2
      package/openssh/Makefile
  2. 24 0
      package/openssh/files/openssh.init

+ 2 - 2
package/openssh/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
-PKG_VERSION:=		10.2p1
+PKG_VERSION:=		10.3p1
 PKG_RELEASE:=		1
-PKG_HASH:=		ccc42c0419937959263fa1dbd16dafc18c56b984c03562d2937ce56a60f798b2
+PKG_HASH:=		56682a36bb92dcf4b4f016fd8ec8e74059b79a8de25c15d670d731e7d18e45f4
 PKG_DESCR:=		secure shell implementation
 PKG_SECTION:=		net/security
 PKG_BUILDDEP:=		zlib openssl

+ 24 - 0
package/openssh/files/openssh.init

@@ -28,6 +28,30 @@ start)
 		echo openssh: key generation exited with code $rv
 		[[ $rv = 0 && -s /etc/ssh/ssh_host_rsa_key ]] || exit 1
 	fi
+	if [[ ! -s /etc/ssh/ssh_host_ecdsa_key ]]; then
+		mkdir -p /etc/ssh
+		if [[ ! -x /usr/bin/ssh-keygen ]]; then
+			echo "openssh not starting: SSH private key missing"
+			exit 0
+		fi
+		echo "openssh: generating SSH private key (ECDSA)"
+		/usr/bin/ssh-keygen -N '' -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key
+		rv=$?
+		echo openssh: key generation exited with code $rv
+		[[ $rv = 0 && -s /etc/ssh/ssh_host_ecdsa_key ]] || exit 1
+	fi
+	if [[ ! -s /etc/ssh/ssh_host_ed25519_key ]]; then
+		mkdir -p /etc/ssh
+		if [[ ! -x /usr/bin/ssh-keygen ]]; then
+			echo "openssh not starting: SSH private key missing"
+			exit 0
+		fi
+		echo "openssh: generating SSH private key (ED25519)"
+		/usr/bin/ssh-keygen -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key
+		rv=$?
+		echo openssh: key generation exited with code $rv
+		[[ $rv = 0 && -s /etc/ssh/ssh_host_ed25519_key ]] || exit 1
+	fi
 	mkdir -p /var/run/sshd
 	mkdir -p /var/empty
 	touch /var/log/btmp && chmod 600 /var/log/btmp