From nobody Fri Nov 11 22:04:24 2022 X-Original-To: dev-commits-src-all@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 4N8CRD3WRtz4gFhR; Fri, 11 Nov 2022 22:04:24 +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 4N8CRD2nT9z3CQ4; Fri, 11 Nov 2022 22:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668204264; 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=8+RkJ47hrNYErNEhJU13Pk0sx/4KRIX91MyA6U2IibU=; b=FJ/dNPSMN1sqyyf44ObYxOp2+p2P/HZTZSYStz02iomp7hsQsPHQ6uoszkjYwQBlL/KIxh GFxB9IKrNpaDLLXs8ZZBkUgvFh9MvPNOiExYZEw0UQ4tZl9CxqLzE9EFmXavx0H0lY8BSW hKE+NSW1/VBh/g7riExelOW4VfJTcA0+5NVffRfcAiGnWyDKPTzdfUHu5ddcmmjD5mtJqY t6J6U8uQWPcw4XiNdXx8w4paWoXhaqgw/WML2hidsLL/QOgLMBMUvCtyyso9XUUMJ9B89d wJolmkUXlgWwIp3edDdALiaFBThyPMZzPtTcvELdQ+7fgKKMi8QWVks44Pap8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668204264; 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=8+RkJ47hrNYErNEhJU13Pk0sx/4KRIX91MyA6U2IibU=; b=q1eAVjj9FyVkcS2HhsAnW3Sv6i4Xilm7futQAGbSgs3gv2z2K2Mkzcm33PQ3P2yT1yBLI8 0V8Yz/a0ZL5F1Mjc16pXr04MmzpACLgY6knyy1xPL+qnI2oAwg2WM43OyUpkKh9d/Ryzvb cpBZHwuA2IURTcMGqUJIckeaAyGbqtYFNJUuKktxIj/eOJZEBmp/6TboXunQafqG1xL3lq j7P08RamK0UqN0yMqbjseXkn7aCCS4nIzvqhdMkBovk1dS9OXDSae5a818R83Xtby9yUl3 3527zflUiDy+au8isKuyjIcGup4MDyo1rd3iPN3pplBeSl/p2slqVyLayK47EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668204264; a=rsa-sha256; cv=none; b=d5L/Aw5cgoDav2sJob9c2GZMKV3Vl9MKaoN1NWl5J07tjpc9xXWHB159+nDF69u8IzO3Jp sbaAwYZUNovCJsgoGo1HpekRGQWzMFWoYutSARXRMvpIZlURGmTTuaQ/R/etUKfQnV0NUJ WvVi5ENYy7aNybsgjE09oLjD7XPGSflSr7yEdD/qi16sC7ZyzlCTQI7hack3kKGGMULV9N +7WDabR0kzT1v0h8WsWmh7i+vpmCidKoIEeePkBGSX8UXc2W+Yb7Lh21iIIqINRs1MJcjS Q5d/4VYOEppuVGHz7VpiqxzwWK6+LjPPqe5gsWr0huunIFhJkxr3xv2c8kALQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N8CRD1P6bzyv9; Fri, 11 Nov 2022 22:04:24 +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 2ABM4OPS005462; Fri, 11 Nov 2022 22:04:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABM4OwW005461; Fri, 11 Nov 2022 22:04:24 GMT (envelope-from git) Date: Fri, 11 Nov 2022 22:04:24 GMT Message-Id: <202211112204.2ABM4OwW005461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: fa7b4b9294d3 - stable/13 - wg: Retire now unused support.h. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: fa7b4b9294d3b42eb26d1019275207f1826a706c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fa7b4b9294d3b42eb26d1019275207f1826a706c commit fa7b4b9294d3b42eb26d1019275207f1826a706c Author: John Baldwin AuthorDate: 2022-10-28 20:36:13 +0000 Commit: John Baldwin CommitDate: 2022-11-11 21:49:57 +0000 wg: Retire now unused support.h. Reviewed by: kevans, markj, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36912 (cherry picked from commit c640d1af2c8ade5bcad6ffcfe92ba946146e565f) --- 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 61828aa03496..44234759e944 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -51,7 +51,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"