diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c --- 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 --- 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 --- 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"