diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-10-29 02:55:53 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-10-29 02:55:53 +0000 |
| commit | 0af061a355e8bd2bbf02b8120c048c72646fe942 (patch) | |
| tree | a45e0bfd40fbc3befce13bc0f834cec4fb46a0cd /sys/arch/arm64/stand/efiboot | |
| parent | c80e1a38f9a7eb07e198ca722f13e170e434709d (diff) | |
Use arc4 to bit-spread the 512-byte random buffer over the .openbsd.randomdata
section, which has grown a fair bit with the introduction of retguard.
Mortimer discovered the repeated 512-byte sequence as retguard keys, and
this resolves the issue. (Chacha does not fit on the media, so 1.5K early
drop RC4 is hopefully sufficient in our KARL link universe)
Version crank the bootblocks. sysupgrade -s will install new bootblocks.
ok djm mortimer
Diffstat (limited to 'sys/arch/arm64/stand/efiboot')
| -rw-r--r-- | sys/arch/arm64/stand/efiboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/arm64/stand/efiboot/conf.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/arm64/stand/efiboot/Makefile b/sys/arch/arm64/stand/efiboot/Makefile index a7b00e48e18..9594d741f73 100644 --- a/sys/arch/arm64/stand/efiboot/Makefile +++ b/sys/arch/arm64/stand/efiboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2019/08/12 19:17:35 kettenis Exp $ +# $OpenBSD: Makefile,v 1.10 2019/10/29 02:55:51 deraadt Exp $ NOMAN= # @@ -29,7 +29,7 @@ SRCS+= alloc.c ctime.c exit.c getchar.c memcmp.c memcpy.c memmove.c memset.c \ strncpy.c strtol.c SRCS+= close.c closeall.c cons.c cread.c dev.c disklabel.c dkcksum.c fchmod.c \ fstat.c lseek.c open.c read.c readdir.c stat.c -SRCS+= loadfile.c +SRCS+= loadfile.c arc4.c SRCS+= ufs.c SRCS+= arp.c ether.c globals.c in_cksum.c net.c netif.c netudp.c tftp.c SRCS+= aes_xts.c bcrypt_pbkdf.c blowfish.c explicit_bzero.c hmac_sha1.c \ diff --git a/sys/arch/arm64/stand/efiboot/conf.c b/sys/arch/arm64/stand/efiboot/conf.c index 3b47ff62681..fa07e6cfefa 100644 --- a/sys/arch/arm64/stand/efiboot/conf.c +++ b/sys/arch/arm64/stand/efiboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.23 2019/08/13 09:00:20 patrick Exp $ */ +/* $OpenBSD: conf.c,v 1.24 2019/10/29 02:55:51 deraadt Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -45,7 +45,7 @@ #include "efipxe.h" #include "softraid_arm64.h" -const char version[] = "0.19"; +const char version[] = "0.20"; int debug = 0; struct fs_ops file_system[] = { |