From nobody Sun May 22 20:45:54 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 A8A121AEB4D5; Sun, 22 May 2022 20:45:54 +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 4L5stV41dWz3qZK; Sun, 22 May 2022 20:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653252354; 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=JcHO/9YorQKtgvceEKjBVp4HHdKmjwTtreJRsMf9EuU=; b=RbnEKZWhiYos5EKqngNwyAUuIO7KAXZkT1f5/fw1oLFssKv92AAYRH6vxa71mGUNosXItu +01uY4a66n6OgNA9lxs1BrvDoyCOpJ7GBXvpPm5P6LLCEQ29oPH4TFSJP5i/FGt3th8vdK nIrXf1urADODwAxlV1XzCmUFV7wf10EOV8bhcOZotVQeSxyNWqcWHqoUgh8j/9jhMGj/ti fRMHfhZQbkDWZ41oI/5hJ3LbtxQqTBu5FJgoHX447SsH5lzpIzvo91HNfTvUtth3ijorwi VmOev7wU6i+Vv8OUu7WoJj06WVqKc3yyiyGfhrRujDOVUHEviIDnU4tjFuEyBg== 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 6990B22237; Sun, 22 May 2022 20:45:54 +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 24MKjskj033524; Sun, 22 May 2022 20:45:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24MKjsGo033523; Sun, 22 May 2022 20:45:54 GMT (envelope-from git) Date: Sun, 22 May 2022 20:45:54 GMT Message-Id: <202205222045.24MKjsGo033523@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: 8d098deda378 - main - rpc.tlsservd: Modify the -C option to use SSL_CTX_set_ciphersuites 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d098deda3786b223e44ad1bed923a6d66dfa341 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653252354; 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=JcHO/9YorQKtgvceEKjBVp4HHdKmjwTtreJRsMf9EuU=; b=A9fWgcLKxMNgdBFzJr6VA6jOsEzCeHvF0bJLs12dA7xq7mqKqsIMS0rnxhcoyLEIKbuigd 5A28aTSKGjP/bGMtjnelLXT72sJ+RNOk5i9g70sdZbbswGWh6DdLoSyXsW+WQGDJsQcf/4 xTNHWFIh1V38SjxINk8OVJ2EtExAZqUyTiv8nRHdfoXCmo4vXIy+O6Xmf7yJIKSP4uwbMq CPoh9XCPiuCKYWj57rkp9262rCD6A3ByV/IVQpj/qduZGU668LxitKeH0iZoFNGSzaPIM3 fnifih9NYD9TfO0RQ/7RTx1m7GQ9OryURC/NzTbUhNDOfhC+0IURP3vBMJV9Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653252354; a=rsa-sha256; cv=none; b=fJ+xg4F5Bqaww8ib2J5h1CLmdMFBY3mOhWc+/APviPCdiFzmULjJoE+/xEUvyZ+84LPLSr tvyzosfdJC5PTGUgt1I8sGuPH5zNaZuqfTt9GEXnTwBSodziy3NGQslQkGqG+OVldaoT1o VpUKnlMYv3ZO3TwE1wPGzFRzi2/0aUc/f2CdRglCnAzFMd48LEBtyXJi3Ve/LNi1lwaEFZ EWX5AMDqYG5N0eggzj2+F39nEl2H+SKC14W0OuR/sCTRY7JViu/WYZy1akhppNPVcE5e4I 7XTNmd4fpYFJROiLgsB4LVAJKfqTngosS0VDQwNcdyVWfOcqP2DJpOCuW95Adw== 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=8d098deda3786b223e44ad1bed923a6d66dfa341 commit 8d098deda3786b223e44ad1bed923a6d66dfa341 Author: Rick Macklem AuthorDate: 2022-05-22 20:44:31 +0000 Commit: Rick Macklem CommitDate: 2022-05-22 20:44:31 +0000 rpc.tlsservd: 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 has already been updated. MFC after: 2 weeks --- usr.sbin/rpc.tlsservd/rpc.tlsservd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c index bbcdba319353..be81b1bab1fc 100644 --- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c +++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c @@ -237,6 +237,7 @@ main(int argc, char **argv) break; default: fprintf(stderr, "usage: %s " + "[-C/--ciphers available_ciphers] " "[-D/--certdir certdir] [-d/--debuglevel] " "[-h/--checkhost] " "[-l/--verifylocs CAfile] [-m/--mutualverf] " @@ -570,14 +571,14 @@ rpctls_setup_ssl(const char *certdir) 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. Normally, not doing this should be ok, * since the library defaults will work. */ - ret = SSL_CTX_set_cipher_list(ctx, rpctls_ciphers); + ret = SSL_CTX_set_ciphersuites(ctx, rpctls_ciphers); if (ret == 0) { rpctls_verbose_out("rpctls_setup_ssl: " - "SSL_CTX_set_cipher_list failed: %s\n", + "SSL_CTX_set_ciphersuites failed: %s\n", rpctls_ciphers); SSL_CTX_free(ctx); return (NULL);