# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1592762773 0
# Node ID 9096d6788292e320f6a1a777e9a71fcffbe48549
# Parent  a2e843f5d9e470ae62f197f7f5de90b4986b5438
dropbear/openssh: generate ed25519 keys

diff -r a2e843f5d9e4 -r 9096d6788292 dropbear/receipt
--- a/dropbear/receipt	Sat Jun 20 14:15:09 2020 +0000
+++ b/dropbear/receipt	Sun Jun 21 18:06:13 2020 +0000
@@ -109,6 +109,7 @@
 /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
 /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
 /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
+/etc/dropbear/dropbear_ed25519_host_key	/etc/ssh/ssh_host_ed25519_key
 EOT
 	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
 #ssh	stream	tcp	nowait	root	dropbear	dropbear	-i -b /etc/dropbear/banner
diff -r a2e843f5d9e4 -r 9096d6788292 dropbear/stuff/init.d/dropbear
--- a/dropbear/stuff/init.d/dropbear	Sat Jun 20 14:15:09 2020 +0000
+++ b/dropbear/stuff/init.d/dropbear	Sun Jun 21 18:06:13 2020 +0000
@@ -17,7 +17,7 @@
 case "$1" in
   start)
     # We need rsa and dss host key file to start dropbear.
-    for type in rsa dss ecdsa ; do
+    for type in rsa dss ecdsa ed25519 ; do
 	[ -s /etc/dropbear/dropbear_${type}_host_key ] && continue
 	action 'Generating Dropbear %s key... ' $type
 	# Need to delete key before creating it.
diff -r a2e843f5d9e4 -r 9096d6788292 linld/stuff/src/CRTL.ASM
--- a/linld/stuff/src/CRTL.ASM	Sat Jun 20 14:15:09 2020 +0000
+++ b/linld/stuff/src/CRTL.ASM	Sun Jun 21 18:06:13 2020 +0000
@@ -1097,8 +1097,7 @@
 @@notvga:
 		mov	cl,10			; radix
 		cmp	al,'-'
-		ja	@@radixkeep
-		cmc				; '+'=2B:C=0 '-'=2D:C=1
+		jne	@@radixkeep
 		lodsb
 @@radixkeep:
 		pushf
@@ -1170,6 +1169,7 @@
 		ifndef	USE_ARGSTR
 		mov	si,bx
 		endif
+		xor	bx,bx
 		xor	cx,cx
 		lodsb
 		or	al,20h
@@ -1187,8 +1187,7 @@
 @@notvga:
 		mov	cl,10			; radix
 		cmp	al,'-'
-		ja	@@radixkeep
-		cmc				; '+'=2B:C=0 '-'=2D:C=1
+		jne	@@radixkeep
 		lodsb
 @@radixkeep:
 		pushf
@@ -1243,12 +1242,12 @@
 		cmp	al,'g'-'a'+10
 		jne	@@noshift
 @@shift:
-		rcl	di,1
+		rcl	bx,1
 		shl	dx,1
 		loop	@@shift
 @@noshift:
 		popf
-		jnc	@@end
+		jne	@@end
 		not	dx
 		neg	bx
 		jne	@@end
diff -r a2e843f5d9e4 -r 9096d6788292 linld/stuff/src/ISOCRTL.ASM
--- a/linld/stuff/src/ISOCRTL.ASM	Sat Jun 20 14:15:09 2020 +0000
+++ b/linld/stuff/src/ISOCRTL.ASM	Sun Jun 21 18:06:13 2020 +0000
@@ -81,8 +81,8 @@
 	macro   curseek
 		push	cx
 		xor	cx,cx
-		xor	dx,dx
 		mov	ax,4201h
+		cwd
 		call	dosfd		; lseek(,0L,SEEK_CUR)
 		call	@doseek2
 	ifndef	NO386
diff -r a2e843f5d9e4 -r 9096d6788292 openssh-pam/receipt
--- a/openssh-pam/receipt	Sat Jun 20 14:15:09 2020 +0000
+++ b/openssh-pam/receipt	Sun Jun 21 18:06:13 2020 +0000
@@ -91,6 +91,7 @@
 /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
 /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
 /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
+/etc/dropbear/dropbear_ed25519_host_key	/etc/ssh/ssh_host_ed25519_key
 EOT
 
 	chroot "$1/" ssh-keygen -A
diff -r a2e843f5d9e4 -r 9096d6788292 openssh/receipt
--- a/openssh/receipt	Sat Jun 20 14:15:09 2020 +0000
+++ b/openssh/receipt	Sun Jun 21 18:06:13 2020 +0000
@@ -89,6 +89,7 @@
 /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
 /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
 /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
+/etc/dropbear/dropbear_ed25519_host_key	/etc/ssh/ssh_host_ed25519_key
 EOT
 
 	chroot "$1/" ssh-keygen -A
diff -r a2e843f5d9e4 -r 9096d6788292 openssh/stuff/openssh
--- a/openssh/stuff/openssh	Sat Jun 20 14:15:09 2020 +0000
+++ b/openssh/stuff/openssh	Sun Jun 21 18:06:13 2020 +0000
@@ -19,7 +19,7 @@
 case "$1" in
 	start)
 		# We need rsa and dsa host key file to start dropbear.
-		for type in rsa dsa ecdsa ; do
+		for type in rsa dsa ecdsa ed25519 ; do
 			[ -s /etc/ssh/ssh_host_${type}_key ] && continue
 			_ 'Generating OpenSSH %s key... ' $type
 			ssh-keygen -t $type -f /etc/ssh/ssh_host_${type}_key -C '' -N ''