From owner-svn-src-projects@freebsd.org Sun May 3 21:59:41 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 499142BB2EF for ; Sun, 3 May 2020 21:59:41 +0000 (UTC) (envelope-from rmacklem@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49FfzK15pJz4Mw5; Sun, 3 May 2020 21:59:41 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 02A6219DF5; Sun, 3 May 2020 21:59:41 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 043LxeID014905; Sun, 3 May 2020 21:59:40 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 043Lxe1L014904; Sun, 3 May 2020 21:59:40 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005032159.043Lxe1L014904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 3 May 2020 21:59:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r360615 - in projects/nfs-over-tls/usr.sbin: rpctlscd rpctlssd X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls/usr.sbin: rpctlscd rpctlssd X-SVN-Commit-Revision: 360615 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 May 2020 21:59:41 -0000 Author: rmacklem Date: Sun May 3 21:59:40 2020 New Revision: 360615 URL: https://svnweb.freebsd.org/changeset/base/360615 Log: Fix handling of ktls not enabled in the daemons. Also, fix a case in the client daemon where it did not obey the "-d" option properly. Modified: projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c Modified: projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c Sun May 3 18:46:03 2020 (r360614) +++ projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c Sun May 3 21:59:40 2020 (r360615) @@ -579,10 +579,18 @@ rpctls_connect(SSL_CTX *ctx, int s) NULL, 0); cp2 = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0); - syslog(LOG_INFO | LOG_DAEMON, "rpctls_connect: client" - " IP %s issuerName=%s subjectName=%s verify " - "failed %s\n", hostnam, cp, cp2, - X509_verify_cert_error_string(ret)); + if (rpctls_debug_level == 0) + syslog(LOG_INFO | LOG_DAEMON, + "rpctls_connect: client IP %s " + "issuerName=%s subjectName=%s verify " + "failed %s\n", hostnam, cp, cp2, + X509_verify_cert_error_string(ret)); + else + fprintf(stderr, + "rpctls_connect: client IP %s " + "issuerName=%s subjectName=%s verify " + "failed %s\n", hostnam, cp, cp2, + X509_verify_cert_error_string(ret)); } SSL_free(ssl); return (NULL); @@ -595,12 +603,14 @@ rpctls_connect(SSL_CTX *ctx, int s) ret = BIO_get_ktls_recv(SSL_get_rbio(ssl)); rpctlscd_verbose_out("rpctls_connect: BIO_get_ktls_recv=%d\n", ret); } -#ifdef notnow if (ret == 0) { + if (rpctls_debug_level == 0) + syslog(LOG_ERR, "ktls not working\n"); + else + fprintf(stderr, "ktls not working\n"); SSL_free(ssl); return (NULL); } -#endif return (ssl); } Modified: projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c Sun May 3 18:46:03 2020 (r360614) +++ projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c Sun May 3 21:59:40 2020 (r360615) @@ -672,12 +672,17 @@ rpctlssd_verbose_out("%s\n", cp2); ret = BIO_get_ktls_recv(SSL_get_rbio(ssl)); rpctlssd_verbose_out("rpctls_server: BIO_get_ktls_recv=%d\n", ret); } -#ifdef notnow if (ret == 0) { - SSL_free(ssl); - return (NULL); + if (rpctls_debug_level == 0) + syslog(LOG_ERR, "ktls not working\n"); + else + fprintf(stderr, "ktls not working\n"); + /* + * The handshake has completed, so all that can be + * done is disable the connection. + */ + *flags |= RPCTLS_FLAGS_DISABLED; } -#endif return (ssl); }