From owner-svn-src-projects@freebsd.org Sat Oct 31 02:53:16 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 6B2F2465CEC for ; Sat, 31 Oct 2020 02:53:16 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CNNz02CY2z3cWH; Sat, 31 Oct 2020 02:53:16 +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 2F16B20E9A; Sat, 31 Oct 2020 02:53:16 +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 09V2rGrQ034716; Sat, 31 Oct 2020 02:53:16 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09V2rFrX034714; Sat, 31 Oct 2020 02:53:15 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202010310253.09V2rFrX034714@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 31 Oct 2020 02:53:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r367193 - in projects/nfs-over-tls/usr.sbin: rpc.tlsclntd rpc.tlsservd X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls/usr.sbin: rpc.tlsclntd rpc.tlsservd X-SVN-Commit-Revision: 367193 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.33 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: Sat, 31 Oct 2020 02:53:16 -0000 Author: rmacklem Date: Sat Oct 31 02:53:15 2020 New Revision: 367193 URL: https://svnweb.freebsd.org/changeset/base/367193 Log: Delete the code that loads modules and just check to see if the kernel supported KERN_TLS. The module loading is now handled by rc.d/ktls. Modified: projects/nfs-over-tls/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c projects/nfs-over-tls/usr.sbin/rpc.tlsservd/rpc.tlsservd.c Modified: projects/nfs-over-tls/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c Sat Oct 31 02:49:02 2020 (r367192) +++ projects/nfs-over-tls/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c Sat Oct 31 02:53:15 2020 (r367193) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -124,10 +125,11 @@ main(int argc, char **argv) struct sockaddr_un sun; int ch, fd, oldmask; SVCXPRT *xprt; - bool cert; + bool cert, tls_enable; struct timeval tm; struct timezone tz; pid_t otherpid; + size_t tls_enable_len; /* Check that another rpctlscd isn't already running. */ rpctls_pfh = pidfile_open(_PATH_RPCTLSCDPID, 0600, &otherpid); @@ -137,15 +139,11 @@ main(int argc, char **argv) warn("cannot open or create pidfile"); } - if (modfind("ktls_ocf") < 0) { - /* Not present in kernel, try loading it */ - if (kldload("ktls_ocf") < 0 || modfind("ktls_ocf") < 0) - errx(1, "Cannot load ktls_ocf"); - } - if (modfind("aesni") < 0) { - /* Not present in kernel, try loading it */ - kldload("aesni"); - } + /* Check to see that the ktls is enabled. */ + tls_enable_len = sizeof(tls_enable); + if (sysctlbyname("kern.ipc.tls.enable", &tls_enable, &tls_enable_len, + NULL, 0) != 0 || !tls_enable) + errx(1, "Kernel TLS not enabled"); /* Get the time when this daemon is started. */ gettimeofday(&tm, &tz); Modified: projects/nfs-over-tls/usr.sbin/rpc.tlsservd/rpc.tlsservd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/rpc.tlsservd/rpc.tlsservd.c Sat Oct 31 02:49:02 2020 (r367192) +++ projects/nfs-over-tls/usr.sbin/rpc.tlsservd/rpc.tlsservd.c Sat Oct 31 02:53:15 2020 (r367193) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -144,6 +145,8 @@ main(int argc, char **argv) struct timezone tz; char hostname[MAXHOSTNAMELEN + 2]; pid_t otherpid; + bool tls_enable; + size_t tls_enable_len; /* Check that another rpctlssd isn't already running. */ rpctls_pfh = pidfile_open(_PATH_RPCTLSSDPID, 0600, &otherpid); @@ -153,15 +156,11 @@ main(int argc, char **argv) warn("cannot open or create pidfile"); } - if (modfind("ktls_ocf") < 0) { - /* Not present in kernel, try loading it */ - if (kldload("ktls_ocf") < 0 || modfind("ktls_ocf") < 0) - errx(1, "Cannot load ktls_ocf"); - } - if (modfind("aesni") < 0) { - /* Not present in kernel, try loading it */ - kldload("aesni"); - } + /* Check to see that the ktls is enabled. */ + tls_enable_len = sizeof(tls_enable); + if (sysctlbyname("kern.ipc.tls.enable", &tls_enable, &tls_enable_len, + NULL, 0) != 0 || !tls_enable) + errx(1, "Kernel TLS not enabled"); /* Get the time when this daemon is started. */ gettimeofday(&tm, &tz);