From nobody Fri Jun 03 02:16:34 2022 X-Original-To: dev-commits-src-branches@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 7F2981B4BE21; Fri, 3 Jun 2022 02:16:34 +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 4LDmhy36nMz3mnp; Fri, 3 Jun 2022 02:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654222594; 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=XCTr/f/P0LRg+4snlpuMWA6W89+5tOQkRrXZUhd/3n8=; b=SIljH9AbywxpTfoVYq7C1G2E17ofsBo24TzEyEpJbkDuCdLuIDerP9o54VBMExFCHOdA1H qPaoyMQLbnSpR3wU9kIRDGnSmQWiMa/Uip5kSl0H0B5MWRfHXOm5Gx2rdOl3TxVj+x4ZH8 zwUc9oSo0z+7fsCTQ3T3cmX1vwYCXy1/yPrHtW0hmR7XqaeFE8SK+xPMcukQ6V7HEtfkZC xewkUP3V2ztKa47eaQflI7x33dXuNTqU/rFFXyjovcgd5o1G9sy+ijkcO7vI6fcZ79aF1Z L2MzMaqSbcrVX1NS+wDK90mxeFOWz351i305ym8tWtZ+tXxL8XAIcR2JUQ/jTg== 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 44974205AE; Fri, 3 Jun 2022 02:16:34 +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 2532GYtD033789; Fri, 3 Jun 2022 02:16:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2532GY2C033788; Fri, 3 Jun 2022 02:16:34 GMT (envelope-from git) Date: Fri, 3 Jun 2022 02:16:34 GMT Message-Id: <202206030216.2532GY2C033788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 45f0c52fa1a6 - stable/13 - rpc.tlsclntd: Add an option to force use of TLS version 1.2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 45f0c52fa1a61af539ab62788594d0f9e8f31d60 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654222594; 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=XCTr/f/P0LRg+4snlpuMWA6W89+5tOQkRrXZUhd/3n8=; b=WNvn5Urga9ygf8lxFqDwKAj9N1TEPZkeKwXEX8r69W7FM8cNlZ3dYdz5+V1wP5gEgFb7zC L0tZOpQO5vER4uNtCZ35me34LZa1PnOLeWyzEsss6pXcUxzRvFM60n48HaR9Plb58lToY/ pA99XHQFInu5s2JdE3XEalA0wEIX4sREFqPmlxPyFgJ5Dft1EaZoHbgMS2gsiHt9YHpcsi Oag3/FC4olYt5ICEPs3fY+vAQvdSFCG6f55HHnQwO4jV1wEAtQJK5iNe0Tac3sm3FC3foz eiQxxnkCiSs2J4bYL27A9SxSZJycfi9LEff7xH0HLkmEUtzUmd99l6RlNytc3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654222594; a=rsa-sha256; cv=none; b=Ts5MxqZsF9wPJ/zzh1yZKcl0S12qrZgrp0Vw3j4Ve8gxOeP+j+QDauPZDsVoaAy50f+5i1 fCUdca7TWH9daEOO5Kmp4BAFiXY3LiyKUzp5tncofs7nAKK8Dar1QeslYh9ljyKHXhIPCf 5BCQcPlnWApdXJSSBFo9T/LNEfJnKK1U4fXXZ6QvwvetUvSBEoFexr7KN2YeAuhcUvsoRb ayNjSAaCT/acsmt6DkVxyvqSfltTvqu4D3kvxgHzL3AHyNoQimIepuYVrtESb2DFzF3UkX MDKl6/O4JgS9s4JEohKjliMkfbFZjKME58PhhBSEp9bng63lGxcgkPpE9kzqAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=45f0c52fa1a61af539ab62788594d0f9e8f31d60 commit 45f0c52fa1a61af539ab62788594d0f9e8f31d60 Author: Rick Macklem AuthorDate: 2022-05-20 21:57:42 +0000 Commit: Rick Macklem CommitDate: 2022-06-03 02:15:40 +0000 rpc.tlsclntd: Add an option to force use of TLS version 1.2 Commit 0b4f2ab0e913 fixes the krpc so that it can use TLS version 1.3 for NFS-over-TLS, as required by the draft (someday to be an RFC). Since FreeBSD 13.0, 13.1 use TLS version 1.2 for NFS-over-TLS mounts, this command line option may be used so that NFS-over-TLS mounts to 13.0, 13.1 servers will still work. Without the command line option, NFS-over-TLS mounts will use TLS version 1.3. The man page update will be a separate commit. (cherry picked from commit 72bf76d6b8c9e9de81661b68389e0035805b8606) --- usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c | 39 ++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c index ac8a91589388..f650c42c539d 100644 --- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c +++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c @@ -96,6 +96,7 @@ static const char *rpctls_ciphers = NULL; static uint64_t rpctls_ssl_refno = 0; static uint64_t rpctls_ssl_sec = 0; static uint64_t rpctls_ssl_usec = 0; +static int rpctls_tlsvers = TLS1_3_VERSION; static void rpctlscd_terminate(int); static SSL_CTX *rpctls_setupcl_ssl(void); @@ -106,6 +107,7 @@ static void rpctls_huphandler(int sig __unused); extern void rpctlscd_1(struct svc_req *rqstp, SVCXPRT *transp); static struct option longopts[] = { + { "usetls1_2", no_argument, NULL, '2' }, { "certdir", required_argument, NULL, 'D' }, { "ciphers", required_argument, NULL, 'C' }, { "debuglevel", no_argument, NULL, 'd' }, @@ -154,9 +156,12 @@ main(int argc, char **argv) rpctls_ssl_usec = tm.tv_usec; rpctls_verbose = false; - while ((ch = getopt_long(argc, argv, "C:D:dl:mp:r:v", longopts, + while ((ch = getopt_long(argc, argv, "2C:D:dl:mp:r:v", longopts, NULL)) != -1) { switch (ch) { + case '2': + rpctls_tlsvers = TLS1_2_VERSION; + break; case 'C': rpctls_ciphers = optarg; break; @@ -463,7 +468,6 @@ static SSL_CTX * rpctls_setupcl_ssl(void) { SSL_CTX *ctx; - long flags; char path[PATH_MAX]; size_t len, rlen; int ret; @@ -567,17 +571,30 @@ rpctls_setupcl_ssl(void) SSL_load_client_CA_file(rpctls_verify_cafile)); } - /* RPC-over-TLS must use TLSv1.3, according to the IETF draft.*/ -#ifdef notyet - flags = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | - SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2; -#else - flags = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1_3; -#endif + /* + * The RFC specifies that RPC-over-TLS must use TLS1.3. + * However, early FreeBSD versions (13.0, 13.1) did not + * support RX for KTLS1.3, so TLS1.2 needs to be used for + * these servers. + */ + ret = SSL_CTX_set_min_proto_version(ctx, rpctls_tlsvers); + if (ret == 0) { + rpctls_verbose_out("rpctls_setupcl_ssl: " + "SSL_CTX_set_min_proto_version failed\n"); + SSL_CTX_free(ctx); + return (NULL); + } + ret = SSL_CTX_set_max_proto_version(ctx, rpctls_tlsvers); + if (ret == 0) { + rpctls_verbose_out("rpctls_setupcl_ssl: " + "SSL_CTX_set_max_proto_version failed\n"); + SSL_CTX_free(ctx); + return (NULL); + } + #ifdef SSL_OP_ENABLE_KTLS - flags |= SSL_OP_ENABLE_KTLS; + SSL_CTX_set_options(ctx, SSL_OP_ENABLE_KTLS); #endif - SSL_CTX_set_options(ctx, flags); #ifdef SSL_MODE_NO_KTLS_TX SSL_CTX_clear_mode(ctx, SSL_MODE_NO_KTLS_TX | SSL_MODE_NO_KTLS_RX); #endif