wok rev 23868

dropbear/openssh: generate ed25519 keys
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Jun 21 18:06:13 2020 +0000 (2020-06-21)
parents a2e843f5d9e4
children 7880bcb5c1e0
files dropbear/receipt dropbear/stuff/init.d/dropbear linld/stuff/src/CRTL.ASM linld/stuff/src/ISOCRTL.ASM openssh-pam/receipt openssh/receipt openssh/stuff/openssh
line diff
     1.1 --- a/dropbear/receipt	Sat Jun 20 14:15:09 2020 +0000
     1.2 +++ b/dropbear/receipt	Sun Jun 21 18:06:13 2020 +0000
     1.3 @@ -109,6 +109,7 @@
     1.4  /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
     1.5  /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
     1.6  /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
     1.7 +/etc/dropbear/dropbear_ed25519_host_key	/etc/ssh/ssh_host_ed25519_key
     1.8  EOT
     1.9  	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
    1.10  #ssh	stream	tcp	nowait	root	dropbear	dropbear	-i -b /etc/dropbear/banner
     2.1 --- a/dropbear/stuff/init.d/dropbear	Sat Jun 20 14:15:09 2020 +0000
     2.2 +++ b/dropbear/stuff/init.d/dropbear	Sun Jun 21 18:06:13 2020 +0000
     2.3 @@ -17,7 +17,7 @@
     2.4  case "$1" in
     2.5    start)
     2.6      # We need rsa and dss host key file to start dropbear.
     2.7 -    for type in rsa dss ecdsa ; do
     2.8 +    for type in rsa dss ecdsa ed25519 ; do
     2.9  	[ -s /etc/dropbear/dropbear_${type}_host_key ] && continue
    2.10  	action 'Generating Dropbear %s key... ' $type
    2.11  	# Need to delete key before creating it.
     3.1 --- a/linld/stuff/src/CRTL.ASM	Sat Jun 20 14:15:09 2020 +0000
     3.2 +++ b/linld/stuff/src/CRTL.ASM	Sun Jun 21 18:06:13 2020 +0000
     3.3 @@ -1097,8 +1097,7 @@
     3.4  @@notvga:
     3.5  		mov	cl,10			; radix
     3.6  		cmp	al,'-'
     3.7 -		ja	@@radixkeep
     3.8 -		cmc				; '+'=2B:C=0 '-'=2D:C=1
     3.9 +		jne	@@radixkeep
    3.10  		lodsb
    3.11  @@radixkeep:
    3.12  		pushf
    3.13 @@ -1170,6 +1169,7 @@
    3.14  		ifndef	USE_ARGSTR
    3.15  		mov	si,bx
    3.16  		endif
    3.17 +		xor	bx,bx
    3.18  		xor	cx,cx
    3.19  		lodsb
    3.20  		or	al,20h
    3.21 @@ -1187,8 +1187,7 @@
    3.22  @@notvga:
    3.23  		mov	cl,10			; radix
    3.24  		cmp	al,'-'
    3.25 -		ja	@@radixkeep
    3.26 -		cmc				; '+'=2B:C=0 '-'=2D:C=1
    3.27 +		jne	@@radixkeep
    3.28  		lodsb
    3.29  @@radixkeep:
    3.30  		pushf
    3.31 @@ -1243,12 +1242,12 @@
    3.32  		cmp	al,'g'-'a'+10
    3.33  		jne	@@noshift
    3.34  @@shift:
    3.35 -		rcl	di,1
    3.36 +		rcl	bx,1
    3.37  		shl	dx,1
    3.38  		loop	@@shift
    3.39  @@noshift:
    3.40  		popf
    3.41 -		jnc	@@end
    3.42 +		jne	@@end
    3.43  		not	dx
    3.44  		neg	bx
    3.45  		jne	@@end
     4.1 --- a/linld/stuff/src/ISOCRTL.ASM	Sat Jun 20 14:15:09 2020 +0000
     4.2 +++ b/linld/stuff/src/ISOCRTL.ASM	Sun Jun 21 18:06:13 2020 +0000
     4.3 @@ -81,8 +81,8 @@
     4.4  	macro   curseek
     4.5  		push	cx
     4.6  		xor	cx,cx
     4.7 -		xor	dx,dx
     4.8  		mov	ax,4201h
     4.9 +		cwd
    4.10  		call	dosfd		; lseek(,0L,SEEK_CUR)
    4.11  		call	@doseek2
    4.12  	ifndef	NO386
     5.1 --- a/openssh-pam/receipt	Sat Jun 20 14:15:09 2020 +0000
     5.2 +++ b/openssh-pam/receipt	Sun Jun 21 18:06:13 2020 +0000
     5.3 @@ -91,6 +91,7 @@
     5.4  /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
     5.5  /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
     5.6  /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
     5.7 +/etc/dropbear/dropbear_ed25519_host_key	/etc/ssh/ssh_host_ed25519_key
     5.8  EOT
     5.9  
    5.10  	chroot "$1/" ssh-keygen -A
     6.1 --- a/openssh/receipt	Sat Jun 20 14:15:09 2020 +0000
     6.2 +++ b/openssh/receipt	Sun Jun 21 18:06:13 2020 +0000
     6.3 @@ -89,6 +89,7 @@
     6.4  /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
     6.5  /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
     6.6  /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
     6.7 +/etc/dropbear/dropbear_ed25519_host_key	/etc/ssh/ssh_host_ed25519_key
     6.8  EOT
     6.9  
    6.10  	chroot "$1/" ssh-keygen -A
     7.1 --- a/openssh/stuff/openssh	Sat Jun 20 14:15:09 2020 +0000
     7.2 +++ b/openssh/stuff/openssh	Sun Jun 21 18:06:13 2020 +0000
     7.3 @@ -19,7 +19,7 @@
     7.4  case "$1" in
     7.5  	start)
     7.6  		# We need rsa and dsa host key file to start dropbear.
     7.7 -		for type in rsa dsa ecdsa ; do
     7.8 +		for type in rsa dsa ecdsa ed25519 ; do
     7.9  			[ -s /etc/ssh/ssh_host_${type}_key ] && continue
    7.10  			_ 'Generating OpenSSH %s key... ' $type
    7.11  			ssh-keygen -t $type -f /etc/ssh/ssh_host_${type}_key -C '' -N ''