From nobody Sun Jun 05 00:57:44 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 431961BD2BF6; Sun, 5 Jun 2022 00:57:46 +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 4LFys619xJz3MBD; Sun, 5 Jun 2022 00:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654390666; 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=Dm6oLvxYodqyISeiEiY1Ec3fqwwpGsBKmn0nhTntkhk=; b=GO4ZakzD60vZZIyaJJvVy8RCcE4wyM/fSSNvtYP+h0f7gk+z0683cu+E9pg/BnA86WdhE4 kAeCVvqr8MHSaUNvUbBqWX/0ITddNsA8aHfutuobQ5+NZmvQLjt/57tKlds8uGtk1Ts/DX GlQ2ARbKcW3WOMNmikR68o2cL4Hda5eQU9VixoJ4pOYxntorYAxxmh/ELrHBwzPbsJdFCT /Net2+IvfripmJA/eUBLRV+ZSpcEw5EGzM+pFqJ8GmtipVSg4bBgHJGYZ2nSNKGO3CuRU/ lgAVIl5PRMPsTrYCOoGx93piucD+jVoeU+WCZGYdbex8tdBCNQYHPyFSdfwtig== 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 D4C38426; Sun, 5 Jun 2022 00:57:45 +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 2550vi1v037005; Sun, 5 Jun 2022 00:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2550viXH037004; Sun, 5 Jun 2022 00:57:44 GMT (envelope-from git) Date: Sun, 5 Jun 2022 00:57:44 GMT Message-Id: <202206050057.2550viXH037004@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: 927f75933b20 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 927f75933b20e353bc69109caef39984faeae5a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654390666; 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=Dm6oLvxYodqyISeiEiY1Ec3fqwwpGsBKmn0nhTntkhk=; b=bhPyFkr/WNZIJXE4BLP8bSjbbDS0ENtyEGdWrKDj5EqCBNVf9Apt2Kt1E5MPp4+J2Py5D5 BIF4Kjsu0uHnO7Q/DfmHN3h1yZu+j75dQXC2Gx4jD3v/VPyarD9/csHl+ULUv1PjNw/bcd 6vSxL9Ou/FAEHMV6os8X+xG5UVFr/rv4cF8x2dCAUExzIzr57CETPXtNly0dtQY/znusRI Y6ke74Badf7btkT7Y/eiizGy3ERMuz/XvB2dRKu765LA6WSOPdK63hDj4BY1bJtcvBKe4F H48qeEhInBE30+7gACaH0lBO7yGr8Pwq8gowZ8+I/akheDnHzyNB0kc8L24J2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654390666; a=rsa-sha256; cv=none; b=T/vYcW/SfWo4pDzzKWnWzbAIgT6SzHDUyLZbSGsSos10swS2i3c9/HzKMwkoMel4uOh+Ay 7lIV5i85tXbWIfTXJZNv7Zr8SconNdwRHweUv8QsgpYs65Iqd/AZEHNO/7u3FfVY5gVJcp GluylGxz9Xm8uwfDCUI02XWSj5LRxxt+9uci6TM5/lJ7R97R2c5ZV8c41mM2f48JyBIYGK s8+SSzoRQzCDAlYVBeY+s81XBhoR+/3OQk9czBoyz1uqYwTN2CYr/rac396LVApuQ1zX8Y cKeWIiWxfkskve4xgqN5wbHKlbhw+BDZm6e+BXw1F8GlK0XV3EDqKfgG16LFRg== 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=927f75933b20e353bc69109caef39984faeae5a8 commit 927f75933b20e353bc69109caef39984faeae5a8 Author: Rick Macklem AuthorDate: 2022-05-22 20:49:08 +0000 Commit: Rick Macklem CommitDate: 2022-06-05 00:56:51 +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. (cherry picked from commit f5b40aa0dea690314bc70f88634a13cbaa53b6f0) --- 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);