From ee6386f2774d24c1dda6ba08383db55c70b05aaf Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 7 Jul 2016 18:45:26 -0400 Subject: Disable RPC daemon on all platforms for now. --- Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 477653e..a275e3d 100644 --- a/Makefile +++ b/Makefile @@ -80,14 +80,28 @@ UNAME := $(shell uname) CFLAGS := -g3 -fPIC -Wall -std=c99 -I${LIBHAL_SRC} LIBS := ${LIBHAL_BLD}/libhal.a ${LIBTFM_BLD}/libtfm.a +# At present, the RPC daemon works on Linux but not on OSX, because the current daemon +# protocol runs over SOCK_SEQPACKET sockets, which Apple doesn't support. In the long run +# this will be a non-issue, as we expect to reimplement the daemon protocol using a secure +# channel which will almost certainly run over SOCK_STREAM instead of SOCK_SEQPACKET. +# +# But this is all moot, because the HSM code to support use of multiple FPGA cores in +# parallel doesn't quite work properly yet, so the daemon doesn't really buy us anything +# useful, and just adds a bit of extra complexity to setup on Linux. +# +# So, for the moment, the default LIBHAL_TARGET is "serial" on all platforms. If for some +# reason you want to try out the daemon on Linux, just change this to "daemon". + +LIBHAL_TARGET := serial + ifeq "${UNAME}" "Darwin" SONAME := libpkcs11.dylib SOFLAGS := -dynamiclib - LIBHAL_TARGET := serial +# LIBHAL_TARGET := serial else SONAME := libpkcs11.so SOFLAGS := -Wl,-Bsymbolic-functions -Wl,-Bsymbolic -Wl,-z,noexecstack -Wl,-soname,${SONAME}.0 - LIBHAL_TARGET := daemon +# LIBHAL_TARGET := daemon endif ifeq "${ENABLE_FOOTNOTE_WARNINGS}" "no" -- cgit v1.2.3