a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From dab16a5fd4efde8ef569b358e19b1fcbc7d0d938 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Mon, 30 Mar 2020 00:10:46 +0200
|
|
Subject: [PATCH] rngd_jitter: disambiguate call to encrypt
|
|
|
|
Commit 0f184ea7e792427fb20afe81d471b565aee96f0b disambiguate the call to
|
|
encrypt in rngd_rdrand.c but did not update rngd_jitter.c.
|
|
|
|
This raise the following build failure:
|
|
|
|
rngd_jitter.c:75:12: error: conflicting types for 'encrypt'
|
|
static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
|
|
^~~~~~~
|
|
In file included from rngd_jitter.c:27:
|
|
/home/dawncrow/buildroot-test/scripts/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/unistd.h:1132:13: note: previous declaration of 'encrypt' was here
|
|
extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1));
|
|
^~~~~~~
|
|
Makefile:770: recipe for target 'rngd-rngd_jitter.o' failed
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/0ca6bf16e3acbc94065b88c4442d6595424b77cb
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/nhorman/rng-tools/pull/89]
|
|
---
|
|
rngd_jitter.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/rngd_jitter.c b/rngd_jitter.c
|
|
index c1b1aca..49a3825 100644
|
|
--- a/rngd_jitter.c
|
|
+++ b/rngd_jitter.c
|
|
@@ -72,7 +72,7 @@ unsigned char *aes_buf;
|
|
char key[AES_BLOCK];
|
|
static unsigned char iv_buf[CHUNK_SIZE] __attribute__((aligned(128)));
|
|
|
|
-static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
|
|
+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
|
|
unsigned char *iv, unsigned char *ciphertext)
|
|
{
|
|
EVP_CIPHER_CTX *ctx;
|
|
@@ -122,7 +122,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src)
|
|
unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS];
|
|
|
|
/* Encrypt the plaintext */
|
|
- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf,
|
|
+ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf,
|
|
ciphertext);
|
|
if (!ciphertext_len)
|
|
return -1;
|
|
--
|
|
2.25.1
|
|
|