From 3a00916f4eb86a96de7f8c94974d20e3ea91c474 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Fri, 10 Jul 2020 09:22:16 -0400 Subject: switch to ed25519, zstd --- Makefile | 9 +++------ cpio_list.txt | 3 +-- make | 3 ++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 3a2f16b..e408200 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,13 @@ all: initramfs.img -initramfs.img: gen_init_cpio dropbear_rsa_host_key dropbear_ecdsa_host_key +initramfs.img: gen_init_cpio dropbear_ed25519_host_key ./make gen_init_cpio: gen_init_cpio.c $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) gen_init_cpio.c -o $@ -dropbear_rsa_host_key: - dropbearkey -t rsa -f $@ - -dropbear_ecdsa_host_key: - dropbearkey -t ecdsa -f $@ +dropbear_ed25519_host_key: + dropbearkey -t ed25519 -f $@ install: initramfs.img rm -f /boot/initramfs.img.old /boot/initramfs.img.new diff --git a/cpio_list.txt b/cpio_list.txt index 1befff4..ed02ceb 100644 --- a/cpio_list.txt +++ b/cpio_list.txt @@ -39,8 +39,7 @@ file /lib/firmware/amdgpu/polaris10_vce.bin /lib/firmware/amdgpu/polaris10_vce.b file /lib/firmware/rtl_nic/rtl8168h-2.fw /lib/firmware/rtl_nic/rtl8168h-2.fw 0644 0 0 # remote unlock -file /etc/dropbear/dropbear_ecdsa_host_key ./dropbear_ecdsa_host_key 0600 0 0 -file /etc/dropbear/dropbear_rsa_host_key ./dropbear_rsa_host_key 0600 0 0 +file /etc/dropbear/dropbear_ed25519_host_key ./dropbear_ed25519_host_key 0600 0 0 file /etc/passwd ./passwd 0644 0 0 file /etc/motd ./motd 0644 0 0 file /lib64/libnss_files.so.2 /lib64/libnss_files.so.2 0755 0 0 diff --git a/make b/make index 4282f64..5dc25f1 100755 --- a/make +++ b/make @@ -1,6 +1,7 @@ #!/bin/sh -[ -n "$compressor" ] || compressor="lz4 --best --favor-decSpeed -l" +#[ -n "$compressor" ] || compressor="lz4 --best --favor-decSpeed -l" +[ -n "$compressor" ] || compressor="zstd -19 -c -T0" #[ -n "$compressor" ] || compressor="xz -c --check=crc32 --x86 --lzma2=preset=9e" toppid=$$ -- cgit v1.2.3-70-g09d2