From nobody Mon Aug 3 11:28:40 2026 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 4hDDvX4s7Rz6nB98 for ; Mon, 03 Aug 2026 11:28:40 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDDvX1qX8z3NhB for ; Mon, 03 Aug 2026 11:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785756520; 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=MlGFeDEcdvvNMnaHxIGJ/v7PTZi9Rub4Cv/NanlzHPc=; b=KPOgP6Vx8WPQCq3t8hXVrbTTy2paH3vh0OkhbG8fBzWZ8Kajx/gQjvDejmietC/772VvVr 2t6ge2USlZ1GQYxBCB1T6FGK45unZYt1ImiW7/pdQuksZm5tcEw10LS4pZ2iWVBexI9BrK /wcadph2u6iFk7N/bKFHzVffNIXWK/qoQtN2DWOAGiiCsF82Bppo7KOS4EGKYlfTh4W9Tr Oq0Hn+A6k838aRjeqRe9mm0pXZ+OCI3USsgaXw+IgoVLIAWJUfxH99Gw7LMTvp9gWw8gTI 3wJ4WVLuoqa1unAcZtl5PYK7ehGtQB+5CARh1C5aeE48pRTTDe1EA5NhnJVyTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785756520; a=rsa-sha256; cv=none; b=RnqpQOInfgfy5XyFi3ULW8iCMa+oHVtLwoKAYlNXUGG4+2FIaUxuE4El/sLqLrBxNC3L31 WbJID+mGDZTi7IyB2yqv+33bRaR+80Svk8vInSc+/AWVACoFt4aMBivZMIdcuieYDkQ/se rhsHxb9apzA7QkON0rnnvOCIr4aTqJZ+u2QLwk+jwNTl2U7rnqvwx8frUbg8iBhd3A3Rzv r1VPlhwvPeNhWg87F/GB13kpxEKV7AM5+V6ejeZcDr2POMWEQhDj/JRLlRFUPRthhoEFLE iKDM47ngVuMsAo5FmCdPkkY3O+MNkcfifz12C+CsmwvmsSOpRvjnRee2KzR04Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785756520; 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=MlGFeDEcdvvNMnaHxIGJ/v7PTZi9Rub4Cv/NanlzHPc=; b=U/+ivlyn7XU2JKgobl8QPtBoZin77rkSlos4aAFsBgC7G9m1pQIaurN5RqP0ny/7hSHPdn UyKRzjKALGQQBLXReLoXU94lTzaqjraLc2EgRe/n0KGzzIOAC7yEOybk/Pg8TGL8nnUJ5i Nu8IXbCBV3NUfKxEqS21bMwS9Qb2tS06WnRWiO6Iv7edLUg/NTsbtbcCti+2anlDUghBIo cAOB0JnrRSkpS3xxw2XfKP9JpTuZfVeZbO8WFx3b4fK/oCcvBSzEKg8PCDxUzLnoBdAGoG fLDOtbygyPsHxJah9Bi+GkhbzP26wV1WjO2UAOqmq81SyEeZg6h/Eo8MOBO3mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDDvX09Stzyjt for ; Mon, 03 Aug 2026 11:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 188cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 11:28:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bruce M Simpson Subject: git: 4e4c7b835aa8 - main - if_wg: Prefix crypto_init() & crypto_deinit() with wg_ for a cleaner namespace. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bms X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e4c7b835aa814a056972e697ac41a9cbfc54a63 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 11:28:40 +0000 Message-Id: <6a707b68.188cb.4bdd1274@gitrepo.freebsd.org> The branch main has been updated by bms: URL: https://cgit.FreeBSD.org/src/commit/?id=4e4c7b835aa814a056972e697ac41a9cbfc54a63 commit 4e4c7b835aa814a056972e697ac41a9cbfc54a63 Author: Bruce M Simpson AuthorDate: 2026-08-01 18:35:02 +0000 Commit: Bruce M Simpson CommitDate: 2026-08-03 11:27:45 +0000 if_wg: Prefix crypto_init() & crypto_deinit() with wg_ for a cleaner namespace. Both these functions have non-static linkage for good reasons, however, their naming may confuse folk when working with crypto(9) code at global scope. --- sys/dev/wg/crypto.h | 4 ++-- sys/dev/wg/if_wg.c | 4 ++-- sys/dev/wg/wg_crypto.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/wg/crypto.h b/sys/dev/wg/crypto.h index ff7b39354749..4e2648d61c80 100644 --- a/sys/dev/wg/crypto.h +++ b/sys/dev/wg/crypto.h @@ -14,8 +14,8 @@ struct mbuf; -int crypto_init(void); -void crypto_deinit(void); +int wg_crypto_init(void); +void wg_crypto_deinit(void); enum chacha20poly1305_lengths { XCHACHA20POLY1305_NONCE_SIZE = 24, diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 611314883643..ffae47938e0a 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -3241,7 +3241,7 @@ wg_module_init(void) wg_packet_zone = uma_zcreate("wg packet", sizeof(struct wg_packet), NULL, NULL, NULL, NULL, 0, 0); - ret = crypto_init(); + ret = wg_crypto_init(); if (ret != 0) return (ret); ret = cookie_init(); @@ -3274,7 +3274,7 @@ wg_module_deinit(void) if (wg_osd_jail_slot != 0) osd_jail_deregister(wg_osd_jail_slot); cookie_deinit(); - crypto_deinit(); + wg_crypto_deinit(); if (wg_packet_zone != NULL) uma_zdestroy(wg_packet_zone); } diff --git a/sys/dev/wg/wg_crypto.c b/sys/dev/wg/wg_crypto.c index 82b80c7fd451..f70c0091c445 100644 --- a/sys/dev/wg/wg_crypto.c +++ b/sys/dev/wg/wg_crypto.c @@ -265,7 +265,7 @@ chacha20poly1305_decrypt_mbuf(struct mbuf *m, const uint64_t nonce, } int -crypto_init(void) +wg_crypto_init(void) { struct crypto_session_params csp = { .csp_mode = CSP_MODE_AEAD, @@ -286,7 +286,7 @@ crypto_init(void) } void -crypto_deinit(void) +wg_crypto_deinit(void) { crypto_freesession(chacha20_poly1305_sid); }