From nobody Fri Nov 11 10:18:10 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 4N7vmL64v3z4XGqf; Fri, 11 Nov 2022 10:18:10 +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 4N7vmL5Z87z3JfX; Fri, 11 Nov 2022 10:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668161890; 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=PpdZ+D/ST5PJUqmKoNS0eYtcEzO4hJzfmas2YE1kaUE=; b=gtODqbVFNElMfOIY0ucYwNyJk5YEhiq7neU9kcxEO/rmfn+LOhS6832csGsUq3Ik0LzHTv 9VxqjEIbSUAaegfKiB3pKhOhkPGg1engffiWCqmmjO4RhN/oMCwsTloFjR67IBM1ZZKJQ6 yeNXCNIpAuuesAKlzmfi70w/SI+QzY8kYldBTAYNS6sr9XqYaIjqn45Q2EsuPcfSUJGUlv 5uBGpYqo/QRHnWzonoLHiyG7C+ItphFoFjr6eW7VNQ+13Dbrjg00o6Sy5UIA8YGetRA89k 4kNJq73Y4Csddj3wfwyIJkHpu8HMo6e8V50p1O0HdD8UqxtJP/Fs2P0qEg1ouA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668161890; 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=PpdZ+D/ST5PJUqmKoNS0eYtcEzO4hJzfmas2YE1kaUE=; b=Kk6wLoncb0BVANtzXEVRxRPfslzgUd1xNbA9BXJ0Ko63URUWuhft4repTLGKo8cchVjAbv sWt5Wj15930el5Nelg1BLvcTrY22NlIz3W4tThPk21/rae9ZHAbfFdDSALWgquh0TkVVhB fTtO00RzhiTYBgE970Y7KZ1mKSfOEElSFnvlRkAkJAQAsEIAgp/Ac7EgoyalpzmkoqsgoS NCbNyfYZcOWIxtvqxwUE9H5TmnZNPGSIBVGMSY4aa5IwbvjS9IveboNLfiZtT5GhB2jFxN AvvbjgOh8sG7wTUlt49X6bW7Eo6DvM5PW8uFZwPIZf/8DlgSjTRwBBhbQkq8aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668161890; a=rsa-sha256; cv=none; b=FB1oYE9Ue2elnADGBW5XaPsca8dC+xHr5e3D2HRKZPDirsrKwPBFr0lbk1sJS5BFn1PBBb pHWtQQgsK0I2seeFPEbj2SQziTEWOhgVMUGxqDPxWtXx6eIABlfxjtL7esaPuZDhmmm6M2 N0J7pzs+lssy6TzjfKByi+HEkW5wdcGEWYDwdJPxeWIGVCE9NuM0dbekTTD/sEnhLNFt0n jBblUcUWM+sUUPMvGbPJRJXnSUjUs/C4dp0RJFTWiZdfwWmbsNlXXHQqP8VhVc7PtXurMX 4uU5FKByc94qixfyl19n88DDNnlSU9VP+VitNYNC/+G8y6pu5WwLGvnRkwJf3A== 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 4N7vmL4dLJzdcH; Fri, 11 Nov 2022 10:18:10 +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 2ABAIAha081634; Fri, 11 Nov 2022 10:18:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABAIAFm081633; Fri, 11 Nov 2022 10:18:10 GMT (envelope-from git) Date: Fri, 11 Nov 2022 10:18:10 GMT Message-Id: <202211111018.2ABAIAFm081633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2c58d0cb3bb3 - main - if_ovpn: fix AES-128-GCM support 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c58d0cb3bb3e3a5b714ffac940500efbe5303ca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c58d0cb3bb3e3a5b714ffac940500efbe5303ca commit 2c58d0cb3bb3e3a5b714ffac940500efbe5303ca Author: Kristof Provost AuthorDate: 2022-11-11 09:40:21 +0000 Commit: Kristof Provost CommitDate: 2022-11-11 10:17:39 +0000 if_ovpn: fix AES-128-GCM support We need to explicitly list AES-128-GCM as an allowed cipher for that mode to work. While here also add AES-192-GCM. That brings our supported cipher list in line with other openvpn/dco platforms. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index e3db105a94d2..94d12fa25f1a 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -694,7 +694,9 @@ ovpn_create_kkey_dir(struct ovpn_kkey_dir **kdirp, if (strcmp(ciphername, "none") == 0) cipher = OVPN_CIPHER_ALG_NONE; - else if (strcmp(ciphername, "AES-256-GCM") == 0) + else if (strcmp(ciphername, "AES-256-GCM") == 0 || + strcmp(ciphername, "AES-192-GCM") == 0 || + strcmp(ciphername, "AES-128-GCM") == 0) cipher = OVPN_CIPHER_ALG_AES_GCM; else if (strcmp(ciphername, "CHACHA20-POLY1305") == 0) cipher = OVPN_CIPHER_ALG_CHACHA20_POLY1305;