From nobody Sun May 22 20:50:12 2022 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 7D8A41AEBE82; Sun, 22 May 2022 20:50:12 +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 4L5szS35pyz3r7F; Sun, 22 May 2022 20:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653252612; 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=SZdCQWCTOjb8bS2oepIeLNmqxcy3B1Jg1jBFLOdbNpE=; b=GFVUycjl0By5v9KxlsZzmWSP7Rsi0R7Z/DMAE1QWn5lPFCFp1oFwUJzQSLXjAy8sfFmHhN /RBSrJ7mFmNNZcUpcy6PF/1j6CsPCTum15DZpGUOgGxz7uxwfG7inv5Y73Nu1jwz+qY+T9 ez9ePzNkzDRZ3b+pXHbncQmZwX15hvzv67tLb24BDZyLLCYXqinmozapOksFG17g0IXUV/ Gpcy/w1RxrZeZNf+RWfPNne8qCVeKXwjsCVue2iiDG4vJ9Slg1c08fMsPZlO0j5asfpERi /Ctjbhu2w+kz5cMPsE10BdLQ1vyhJ8il+c2S/XiKe+k0nNjFbnZbdsqQnahofw== 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 4A6512242D; Sun, 22 May 2022 20:50:12 +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 24MKoC06037716; Sun, 22 May 2022 20:50:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24MKoCQi037709; Sun, 22 May 2022 20:50:12 GMT (envelope-from git) Date: Sun, 22 May 2022 20:50:12 GMT Message-Id: <202205222050.24MKoCQi037709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: f5b40aa0dea6 - main - rpc.tlsclntd: Modify the -C option to use SSL_CTX_set_ciphersuites 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5b40aa0dea690314bc70f88634a13cbaa53b6f0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653252612; 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=SZdCQWCTOjb8bS2oepIeLNmqxcy3B1Jg1jBFLOdbNpE=; b=CHLFYTkxW498Rmx4RFbXPGrQPhmRpZdUzCDCzIJbapqudC/TErwYLxW/CD4wfiJCqgEVAf P8EwsRkg9XREE/kdkJt2l2Fv4W/t3WOuadpHnMPKXZJger5vgx7mIqUs3+sLMRs6k08mD0 BxfRvbxE0TaHabFcgspSSyrot+EkPGzeaoB2rEgttPo1XYDxQQO7TRzbrh4xa28VdlezHI xD8eR4wypU7tAfqbCaLhMS2fuH90pe2e8+WMNT3+L1sSxlCi7U81TXFgozMRYQIJwAUfkd +NESGC3RD6n21OpOSRsVKDGkUmR7f8YveWMKiBLsh6iwohW84IgH+je8noqnkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653252612; a=rsa-sha256; cv=none; b=U3fJ8NCaqUAhAlFYs6K4tYJZMEesD9nUfDMSJse5XDmXzjVt3sJSoae+lgAjmFBL/rEWRV BwXipCwFDv+AhKhlhlnCOyrW9VDrhqRAF9KjAPyF1XoyUBo2WLMGNvNhXcJpdiD6rsEz3b 7jE1zLvpiEcNA4CuwI5a+pOA9gcUb4WTPZcN/oWUTA1LcBRTnk0a74IwwOUBnvYIbamXCt Za7Lyj4O9q65zoPvCXttFi3TG8rWST9qS2EzwKeQydCr57Y9pNIHqXYBFlxzSDILWYvdAn csgpeN7ywUbO27um2ttXTgvYDEle4PSfMdudGwGn+9iy0tQukrepmsLX73sSEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f5b40aa0dea690314bc70f88634a13cbaa53b6f0 commit f5b40aa0dea690314bc70f88634a13cbaa53b6f0 Author: Rick Macklem AuthorDate: 2022-05-22 20:49:08 +0000 Commit: Rick Macklem CommitDate: 2022-05-22 20:49:08 +0000 rpc.tlsclntd: Modify the -C option to use SSL_CTX_set_ciphersuites 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). This patch replaces SSL_CTX_set_cipher_list() with SSL_CTX_set_ciphersuites(), since that is the function that is used for TLS1.3. The man page will be updated in a separate commit. MFC after: 2 weeks --- usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c index f650c42c539d..0c2549578f2d 100644 --- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c +++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c @@ -188,7 +188,7 @@ main(int argc, char **argv) break; default: fprintf(stderr, "usage: %s " - "[-C/--ciphers preferred_ciphers] " + "[-C/--ciphers available_ciphers] " "[-D/--certdir certdir] [-d/--debuglevel] " "[-l/--verifylocs CAfile] [-m/--mutualverf] " "[-p/--verifydir CApath] [-r/--crl CRLfile] " @@ -486,13 +486,13 @@ rpctls_setupcl_ssl(void) if (rpctls_ciphers != NULL) { /* - * Set preferred ciphers, since KERN_TLS only supports a + * Set available ciphers, since KERN_TLS only supports a * few of them. */ - ret = SSL_CTX_set_cipher_list(ctx, rpctls_ciphers); + ret = SSL_CTX_set_ciphersuites(ctx, rpctls_ciphers); if (ret == 0) { rpctls_verbose_out("rpctls_setupcl_ssl: " - "SSL_CTX_set_cipher_list failed: %s\n", + "SSL_CTX_set_ciphersuites failed: %s\n", rpctls_ciphers); SSL_CTX_free(ctx); return (NULL);