From nobody Fri Oct 28 20:56:01 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MzZZn5SMvz4h4pS; Fri, 28 Oct 2022 20:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MzZZn4c12z4Q5L; Fri, 28 Oct 2022 20:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666990561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lTwRmAGmA+t4krkmjRqHtm6AOpUUTet5eQnHNwqs44k=; b=gnLIXasBmsRUVA/3TAunWCTEd628d4fYTSxfKAPJQLjtHo4JNTxkXu/KyspiVZmhcFUYq3 GZRyMlsQLeypWu2+30Wx/eXSh+wXgJictSi8DixschnuFfXx0Q7F5TMY3gxa33jvWgVFRv LwUTiACKfS/yRcRlTki2R2TYLL6UC6yQcH3buNT1N0SQPNVNF1rsiVQPxO2rPrzgIg5BD1 0FHw+lrMEPc20bNTCaN9kvw4Su6R6Nrj3xXIkdwalcpUuvS6t0xEtGTDsZ5D8oY4ernol+ RitKutTeXI6uydLrfMfJb3TQyhUhcYhP9TALARKhhNWLKeQYebrE9Nel1DiMkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MzZZn34y5zrmV; Fri, 28 Oct 2022 20:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29SKu1bg007207; Fri, 28 Oct 2022 20:56:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29SKu1us007206; Fri, 28 Oct 2022 20:56:01 GMT (envelope-from git) Date: Fri, 28 Oct 2022 20:56:01 GMT Message-Id: <202210282056.29SKu1us007206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c640d1af2c8a - main - wg: Retire now unused support.h. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c640d1af2c8ade5bcad6ffcfe92ba946146e565f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666990561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lTwRmAGmA+t4krkmjRqHtm6AOpUUTet5eQnHNwqs44k=; b=iJnog8L4dPdfpI4efiZTWtjqe8RI12bHazQlrheuh6hLx3JIKlXS68uWfXUdyicSky5Mq2 7rb86HVZ7xHTG0D4krOY66d46zV9xLehV9NT1hOLDr1VTjZkOyfhCCwqabwO/qEBZnUMlI E8vms651cZ9CgjREkUQqTbRx5xVDKCSC0mqg+a7hXtLCTs3yfke6lakXfTKLUjE0ROmHsu E/zgOIrqhanBLxu6w6PB3dzI+qxBHI7jbamq2hfD6Hmm/m3i1Ndrvgxk6H5nb73796vDa+ fsvePMXkY17MfWFeY0vyWCgWVCoaxXSjXsniSfDV5BwFVjmd/1mgGOkVDVoRRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666990561; a=rsa-sha256; cv=none; b=FuMsoXSsRQAywr/f0XoqGEskPh9SV7PsfYknBUiWPuly1ve4l/xALP+JPWVl33rtw28jW3 s01S7K5HZBcytC5dE3t3Ej35CbSlZoVztiO96UIdiI5sYZ3LPGJKsPlWiNiw7YLuUGG7xQ +SeLV7Q3E1Jjvq9Zr3glbvyX8dTZgx666fzkCU2XOdJzYtL1mgHZdujUVyzD5xLq7slvG/ DFQMVu63M9ICJhlnMrhPxrmdC4htIiqbD/bGIm3tBv9ihvw4dEQTjhg/1d1I4FzaqSHJFL B1rPjaBzO9fknj1J4zIBbc0zCBDg5xl7zVmHzryCOznsJ0hOocaCGAiJnw8C1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c640d1af2c8ade5bcad6ffcfe92ba946146e565f commit c640d1af2c8ade5bcad6ffcfe92ba946146e565f Author: John Baldwin AuthorDate: 2022-10-28 20:36:13 +0000 Commit: John Baldwin CommitDate: 2022-10-28 20:36:13 +0000 wg: Retire now unused support.h. Reviewed by: kevans, markj, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36912 --- sys/dev/wg/if_wg.c | 1 - sys/dev/wg/support.h | 21 --------------------- sys/dev/wg/wg_noise.c | 1 - 3 files changed, 23 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 07c33fb98158..dba4c88601cd 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -48,7 +48,6 @@ #include #include -#include "support.h" #include "wg_noise.h" #include "wg_cookie.h" #include "version.h" diff --git a/sys/dev/wg/support.h b/sys/dev/wg/support.h deleted file mode 100644 index 7934c5784a40..000000000000 --- a/sys/dev/wg/support.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: ISC - * - * Copyright (C) 2021 Jason A. Donenfeld . All Rights Reserved. - * Copyright (c) 2021 Kyle Evans - * - * support.h contains code that is not _yet_ upstream in FreeBSD's main branch. - * It is different from compat.h, which is strictly for backports. - */ - -#ifndef _WG_SUPPORT -#define _WG_SUPPORT - -#ifndef ck_pr_store_bool -#define ck_pr_store_bool(dst, val) ck_pr_store_8((uint8_t *)(dst), (uint8_t)(val)) -#endif - -#ifndef ck_pr_load_bool -#define ck_pr_load_bool(src) ((bool)ck_pr_load_8((uint8_t *)(src))) -#endif - -#endif diff --git a/sys/dev/wg/wg_noise.c b/sys/dev/wg/wg_noise.c index 73ee712b11e9..3db74ac9580f 100644 --- a/sys/dev/wg/wg_noise.c +++ b/sys/dev/wg/wg_noise.c @@ -20,7 +20,6 @@ #include "crypto.h" #include "wg_noise.h" -#include "support.h" /* Protocol string constants */ #define NOISE_HANDSHAKE_NAME "Noise_IKpsk2_25519_ChaChaPoly_BLAKE2s"