From nobody Tue Nov 07 10:43:30 2023 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 4SPlDy4jc7z50nLW; Tue, 7 Nov 2023 10:43:30 +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 4SPlDy4HF9z3Vrv; Tue, 7 Nov 2023 10:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699353810; 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=Xoi09Hf9ABrdR3T2FEaX3EVlTcD4uDNw/9sT8bH42+U=; b=Bsw+HDQtzAhWeoGPb0zdPiejUQ7DtToCreJWPFV41OqkKlQjke/OE/abbjc+MplvkQwoOF k2+jkfE5sSHyxcsuuoNVVi8zEOTxZOdiUBgIJpbfIxF1Iq+uuco6ZrUe6j9XebdP2ETc/O xovYbueatnEsG45ocCx/13+I7glb+hxWgdFNkSSuCzMW2vDepCEzvXdxJ6beJF2uR3+hex B6nAWxNSg+oECeT+tuzzAHFXgAXZowICK7MlenCEwcxsy4T3BG88xQV2roe3tfVREQ4BWp a8hb8GBb1rChmK3vLxxW2rmUkw5okHtFjXpokAGx9p+VImF9s0LnHtKDRnpW4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699353810; 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=Xoi09Hf9ABrdR3T2FEaX3EVlTcD4uDNw/9sT8bH42+U=; b=L/ZHrTrDJx3SKgC9b+m9ku9REWN9vIcdrB5XId5rPqOBzKmoQAAp1mkQwiOBvEPjzA11Nz W2ezOH1nkJAwdirwoZg4U25WGBOHPtx3+D+rKeTEOrB5NuAAgxcEcNOOAWds3DcoMYuW2L EbNOANy7tUYoMlbiosBTA92BAT4ICQ1yzWFPhbSJsZ6NKwFlOpV7UmE/La/KGg9at/Znfr vHKxeeC+Qekp1XmVBPp0ppowfJTO3O+H9w9SL0eGSF/mMs/fOZZutVSnQOP+TcB2jLh4Uw sCCu7RzF4DZEz8bWYr6Q5l9w8tiueDESmdi1lX98V50l5nLx5DUPydVFu06rHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699353810; a=rsa-sha256; cv=none; b=N/rLYc4geAJw4lBx2WRcNnWYRjEO+HLFaWo2CJmEOQIh/2ViP0U/nkSt6mQTER+8nhKKkg s2G6ImWg7Eay7F2clwIQt6kCKNCFTbDJIEjcldPgjSNtdenp7DkV2Ce/lC0s8dbzR7AS0G myZcSdSiK2oiBdcC/fiho/kzSaDiIakQbPg4V/fWH+Up54lyTgoRLUIOOVQjCJI4ZYJzWe wBmxva+bQywn9IUSKWlTafI0XX1pkNeJz6oEb+I1aQQIV89Tp6eY2MU0tC542VUqXGIDJm 1f9wsK/qe3ASXv8lBSERIrw8RXsW1EF5pMk3EUWx7d/vQK04ZidacYlDYRnpFA== 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 4SPlDy3M5vzmjB; Tue, 7 Nov 2023 10:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7AhU0s066964; Tue, 7 Nov 2023 10:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7AhUBP066961; Tue, 7 Nov 2023 10:43:30 GMT (envelope-from git) Date: Tue, 7 Nov 2023 10:43:30 GMT Message-Id: <202311071043.3A7AhUBP066961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 51224d6d2e1d - stable/14 - setkey(8): make the policy specification more readable 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 51224d6d2e1dfca2a7c20b8b10423e4a6d0ad819 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=51224d6d2e1dfca2a7c20b8b10423e4a6d0ad819 commit 51224d6d2e1dfca2a7c20b8b10423e4a6d0ad819 Author: Konstantin Belousov AuthorDate: 2023-10-31 04:07:10 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-07 10:42:58 +0000 setkey(8): make the policy specification more readable (cherry picked from commit 224fc33f603884e7eb9ed219afdd4c57ddec3cb9) --- sbin/setkey/setkey.8 | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8 index 7dab0f622efd..8eece16030e5 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 27, 2023 +.Dd October 31, 2023 .Dt SETKEY 8 .Os .\" @@ -472,27 +472,43 @@ is expressed in one of the following three formats: .Xc .El .Pp -The direction of a policy must be specified as -one of: +.Bl -tag -compact -width "policy level" +.It Ar direction +The +.Ar direction +of a policy must be specified as one of: .Li out or .Li in . +.It Ar policy level The direction is followed by one of the following policy levels: .Li discard , .Li none , or .Li ipsec . +.Bl -compact -bullet +.It The .Li discard -policylevel means that packets matching the supplied indices will -be discarded while +policy level means that packets matching the supplied indices will +be discarded. +.It +The .Li none -means that IPsec operations will not take place on the packet and +policy level means that IPsec operations will not take place on +the packet. +.It +The .Li ipsec -means that IPsec operation will take place onto the packet. +policy level means that IPsec operation will take place onto +the packet. +.El +.It Ar protocol/mode/src-dst/level The .Ar protocol/mode/src-dst/level statement gives the rule for how to process the packet. +.Bl -compact -bullet +.It The .Ar protocol is specified as @@ -500,12 +516,15 @@ is specified as .Li esp or .Li ipcomp . +.It The .Ar mode is either .Li transport or .Li tunnel . +.El +.Pp If .Ar mode is @@ -517,6 +536,7 @@ and with a dash, .Sq - , between the addresses. +.Pp If .Ar mode is @@ -526,6 +546,7 @@ both and .Ar dst can be omitted. +.Pp The .Ar level is one of the following: @@ -534,25 +555,32 @@ or .Li unique . If the SA is not available in every level, the kernel will request the SA from the key exchange daemon. +.Pp +.Bl -compact -bullet +.It A value of .Li default tells the kernel to use the system wide default protocol e.g.,\& the one from the .Li esp_trans_deflev sysctl variable, when the kernel processes the packet. +.It A value of .Li use means that the kernel will use an SA if it is available, otherwise the kernel will pass the packet as it would normally. +.It A value of .Li require means that an SA is required whenever the kernel sends a packet matched that matches the policy. +.It The .Li unique level is the same as .Li require but, in addition, it allows the policy to bind with the unique out-bound SA. +.Pp For example, if you specify the policy level .Li unique , .Xr racoon 8 Pq Pa ports/security/ipsec-tools @@ -570,6 +598,8 @@ must be between 1 and 32767, which corresponds to .Ar extensions Fl u of manual SA configuration. +.El +.El .Pp When you want to use an SA bundle, you can define multiple rules. For