From nobody Mon Feb 9 19:26:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 647E91DA24 for ; Mon, 29 Jul 2024 17:06:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722272803; cv=none; b=bBzwrIvASpr7jCkHAXf3skUwSTodrnDFIv6Cq8mQ9/0MCHC/8Gakx+wN0QMjWe1g0BHafEzX9xtSN/nD6MlCPJo/rrywMIvMheUstjtfYc51QmoSICYCHk/O3CygnVWcAbpZcQOZwiQR+v0Zr+DDTlMSAFSSCEO5N8vEEug18a8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722272803; c=relaxed/simple; bh=H8LqM1vVwV4D2NOWzzUb8ajziic3Ihe9GcXyFxhFMrc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mMu8/y8uDak/B2qLrNGiuRbG7HT73MNMPDQPswNBo5yw+KA1Q3CWRDXWSzxrYc+YrYsxz8CVy8D2xonPVJm1WtlrjFN1fnujkPH/lU6EDMB8kDpjfUv6LHjBtjwcPafUWnOOe3TZ8c6CR8/T+U3SuBF8cYS6BQwSDiDHizWUdyc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b=Qwz/LIT9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="Qwz/LIT9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A741CC32786; Mon, 29 Jul 2024 17:06:42 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="Qwz/LIT9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1722272801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5KzOgCsm4+QXyIMxKMBzF9Y+HbbcubFAkdH7t3Gz8ZQ=; b=Qwz/LIT9iIlWm2q6np3OpS55lH44ORkE+gXBQ2sKBmmdyAH7svVVd0nAiVA3ylXND+AFLJ tmx+1qc+9RY/R5VQ6Wp78SPxT4fzNw/MBc1S8v6mjM8tpOiVZ3Lo560oCwW04nVtwgDjD8 yFKsKu/yzjl6JW/OsyA4t0JcgtVlvKQ= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id a0b094c3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 29 Jul 2024 17:06:40 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org Cc: "Jason A. Donenfeld" Subject: [PATCH] selftests/vDSO: don't #include sodium header in chacha test Date: Mon, 29 Jul 2024 19:06:33 +0200 Message-ID: <20240729170637.335506-1-Jason@zx2c4.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With changes in various kernel headers, there's a clash if we include the libsodium header. This is especially hard to fix with build flags, because we're compiling the assembly together with the C file, for testing. Instead, just add the single library prototype we're using in the file and don't bother including the real header. Signed-off-by: Jason A. Donenfeld --- tools/testing/selftests/vDSO/vdso_test_chacha.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/vDSO/vdso_test_chacha.c b/tools/testin= g/selftests/vDSO/vdso_test_chacha.c index e38f44e5f803..ade9897535a1 100644 --- a/tools/testing/selftests/vDSO/vdso_test_chacha.c +++ b/tools/testing/selftests/vDSO/vdso_test_chacha.c @@ -3,13 +3,13 @@ * Copyright (C) 2022-2024 Jason A. Donenfeld . All Right= s Reserved. */ =20 -#include #include #include #include #include "../kselftest.h" =20 extern void __arch_chacha20_blocks_nostack(uint8_t *dst_bytes, const uint8= _t *key, uint32_t *counter, size_t nblocks); +extern int crypto_stream_chacha20(uint8_t *dst_bytes, uint64_t dst_len, co= nst uint8_t *nonce, const uint8_t *key); =20 int main(int argc, char *argv[]) { --=20 2.45.2