Date: Sun, 26 Jan 2020 19:08:38 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r357155 - projects/nfs-over-tls/sys/conf Message-ID: <202001261908.00QJ8cZs074148@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Sun Jan 26 19:08:37 2020 New Revision: 357155 URL: https://svnweb.freebsd.org/changeset/base/357155 Log: Update sys/conf/files to build the new files for RPC-over-TLS. With this patch, the kernel should now build with the new RPC-over-TLS code in it. I have not yet added the Makefile changes for the kernel RPC module build to sys/modules/krpc. It sort of works, in the sense that it does a handshake when the rpctlscd (client) and rpctlssd (server) daemons are running, and then does unencrypted NFS RPCs (assuming the kernel does not have the KERN_KTLS option). The ktls needs to support receive before encryption can be done. It also currently (mis)uses the gssd_syscall, so the gssd can't be run with this kernel. Adding a new syscall will be done later. (It is just more convenient to test this was instead of having to build the libc syscall glue, etc.) Modified: projects/nfs-over-tls/sys/conf/files Modified: projects/nfs-over-tls/sys/conf/files ============================================================================== --- projects/nfs-over-tls/sys/conf/files Sun Jan 26 18:57:33 2020 (r357154) +++ projects/nfs-over-tls/sys/conf/files Sun Jan 26 19:08:37 2020 (r357155) @@ -4850,6 +4850,41 @@ rpc/svc_auth_unix.c optional krpc | nfslockd | nfscl rpc/svc_dg.c optional krpc | nfslockd | nfscl | nfsd rpc/svc_generic.c optional krpc | nfslockd | nfscl | nfsd rpc/svc_vc.c optional krpc | nfslockd | nfscl | nfsd +# +# Kernel RPC-over-TLS +# +rpctlscd.h optional krpc | nfslockd | nfscl | nfsd \ + dependency "$S/rpc/rpcsec_tls/rpctlscd.x" \ + compile-with "RPCGEN_CPP='${CPP}' rpcgen -hM $S/rpc/rpcsec_tls/rpctlscd.x | grep -v pthread.h > rpctlscd.h" \ + no-obj no-implicit-rule before-depend local \ + clean "rpctlscd.h" +rpctlscd_xdr.c optional krpc | nfslockd | nfscl | nfsd \ + dependency "$S/rpc/rpcsec_tls/rpctlscd.x rpctlscd.h" \ + compile-with "RPCGEN_CPP='${CPP}' rpcgen -c $S/rpc/rpcsec_tls/rpctlscd.x -o rpctlscd_xdr.c" \ + no-implicit-rule before-depend local \ + clean "rpctlscd_xdr.c" +rpctlscd_clnt.c optional krpc | nfslockd | nfscl | nfsd \ + dependency "$S/rpc/rpcsec_tls/rpctlscd.x rpctlscd.h" \ + compile-with "RPCGEN_CPP='${CPP}' rpcgen -lM $S/rpc/rpcsec_tls/rpctlscd.x | grep -v string.h > rpctlscd_clnt.c" \ + no-implicit-rule before-depend local \ + clean "rpctlscd_clnt.c" +rpctlssd.h optional krpc | nfslockd | nfscl | nfsd \ + dependency "$S/rpc/rpcsec_tls/rpctlssd.x" \ + compile-with "RPCGEN_CPP='${CPP}' rpcgen -hM $S/rpc/rpcsec_tls/rpctlssd.x | grep -v pthread.h > rpctlssd.h" \ + no-obj no-implicit-rule before-depend local \ + clean "rpctlssd.h" +rpctlssd_xdr.c optional krpc | nfslockd | nfscl | nfsd \ + dependency "$S/rpc/rpcsec_tls/rpctlssd.x rpctlssd.h" \ + compile-with "RPCGEN_CPP='${CPP}' rpcgen -c $S/rpc/rpcsec_tls/rpctlssd.x -o rpctlssd_xdr.c" \ + no-implicit-rule before-depend local \ + clean "rpctlssd_xdr.c" +rpctlssd_clnt.c optional krpc | nfslockd | nfscl | nfsd \ + dependency "$S/rpc/rpcsec_tls/rpctlssd.x rpctlssd.h" \ + compile-with "RPCGEN_CPP='${CPP}' rpcgen -lM $S/rpc/rpcsec_tls/rpctlssd.x | grep -v string.h > rpctlssd_clnt.c" \ + no-implicit-rule before-depend local \ + clean "rpctlssd_clnt.c" +rpc/rpcsec_tls/rpctls_impl.c optional krpc | nfslockd | nfscl | nfsd +rpc/rpcsec_tls/auth_tls.c optional krpc | nfslockd | nfscl | nfsd rpc/rpcsec_gss/rpcsec_gss.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi rpc/rpcsec_gss/rpcsec_gss_conf.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi rpc/rpcsec_gss/rpcsec_gss_misc.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001261908.00QJ8cZs074148>