From nobody Sun Jun 05 00:46:49 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 653361BD1089; Sun, 5 Jun 2022 00:46:50 +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 4LFycV1l13z3KdP; Sun, 5 Jun 2022 00:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654390010; 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=QASXyE86XMbvirdlfMPosbEVwVXxgaJyJ2SsO4JHYQ8=; b=VZKXmp4UdLH+mtxhHzjXXV1D9Dm7bCPv0E/9djLLVJSLM8rMXh2VFu0VQVHtaoJJTRsTVy c7JxTyiWuVIcQhQruJZ3Lu+XFWmFP2HehP69bgUwSlKoBJaOp8KQCDkJxqvU/hrb1atVqe dX36JgpjuOWUFRnmUmSYT8SxTqIdEqO7GJ40mMilOoOK1Cl9zG+2xjocKo99+rLXvMCqsl NZvhHTw2HF7YnzZfFZj/DNmi/vQ/41te0zP42/If5a+hMBHFxjZrOXAe82J77QQxClcu7/ 7DoU0bK9BhTngR+GlXW7GIjDcfH59PQAj0VfNzORCmiBARIAUh9XFfHIsTF2NA== 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 BB72518B; Sun, 5 Jun 2022 00:46:49 +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 2550knKX023506; Sun, 5 Jun 2022 00:46:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2550kn6G023505; Sun, 5 Jun 2022 00:46:49 GMT (envelope-from git) Date: Sun, 5 Jun 2022 00:46:49 GMT Message-Id: <202206050046.2550kn6G023505@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: 2c59ffb05729 - stable/13 - rpc.tlsservd: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c59ffb05729332e9b64545dd8a21e1c3bd0e690 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654390010; 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=QASXyE86XMbvirdlfMPosbEVwVXxgaJyJ2SsO4JHYQ8=; b=IgeSaGNl57htJ11eaDK2snU/2s+sXoAMDVwttRgA9PcAIGBekAe7aqFlegL6pZa1ksGz8D k4wp0YTBUXAu4xw3Jg2v/mMVn6AijyBoIOsFzLniUGV5ccZH5CTFzRcai4hqj6Bv5N6SxA QcLj9Q8jazE7RgSTQRo2PmS3JwefFDU/NZUfzO+Eps1SZe5yQy1aZrHsOOkEJoKZhZYVqh /GLneq8rBSnxpNiZnZbcqA/cogf+4M2AurNWmf/2rxETiJhnfXs3KdFjLLplqLYl+K856+ +2nogK9QyA/Lm8I6rZUVFXBNkxWbqiy66i6iugxiNhH4crc7PYYD472naA+rFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654390010; a=rsa-sha256; cv=none; b=UfLXj++lmsn7tH5w2qWJh1lLxZtaJUddNMZ2/aJ8rR0wUSwRKORADMLWxHRRPlpeIKcBb2 d/pt8vyjgKroh0Y/VugxqLhQqAAV5TbFJC63s6TLHRYAnwNg3FWl/k+yQfVylhvkiQCsMR ezxdbDs6F7N2X3dZl/qC9PSk3grBMdC9xf1Hd5ozoqHOfhj8YDaZh0q+Sq0up2YT81to5N BinV6XcVk5AjfA2W2SNvO95R/iKXUqhdogXiH4VXeA8AsIjkvPwDfPFAhcALNTUzZmMxTd bqh7rsHiv5ItMEuQL9DcSNssWRiRJEeGgjxZsxqLRGC5dZVhp5vIlp9fSoD6gQ== 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=2c59ffb05729332e9b64545dd8a21e1c3bd0e690 commit 2c59ffb05729332e9b64545dd8a21e1c3bd0e690 Author: Rick Macklem AuthorDate: 2022-05-22 20:44:31 +0000 Commit: Rick Macklem CommitDate: 2022-06-05 00:45: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. (cherry picked from commit 8d098deda3786b223e44ad1bed923a6d66dfa341) --- 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 96f3c06a5c2e..206a1f4fd3bd 100644 --- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c +++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c @@ -238,6 +238,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] " @@ -571,14 +572,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);