[Cryptech-Commits] [sw/libhal] 01/01: Merge branch 'master' into macosx

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch macosx
in repository sw/libhal.

commit 6603db3cdf1ea39d0f2c908d679a4707a204afde
Merge: 57a33b0 183fc0a
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Fri Jul 1 00:23:06 2016 -0400

    Merge branch 'master' into macosx
    
    Too many recent tweaks to same few lines of this Makefile for a
    straight merge to work; fortunately, the obvious simplification should
    also work as a fix for the most recent problem.

 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --cc Makefile
index 01afdc2,3d42d8f..9f9b25e
--- a/Makefile
+++ b/Makefile
@@@ -72,7 -72,7 +72,8 @@@ endi
  # makefile, so the working definition of "always want" is sometimes
  # just "building this is harmless even if we don't use it."
  
- OBJ = errorstrings.o hash.o asn1.o ecdsa.o rsa.o ${KS_OBJ} rpc_api.o xdr.o rpc_hash.o rpc_misc.o rpc_pkey.o rpc_client.o rpc_server.o
 -OBJ = errorstrings.o hash.o asn1.o ecdsa.o rsa.o ${KS_OBJ}
++OBJ += errorstrings.o hash.o asn1.o ecdsa.o rsa.o ${KS_OBJ} xdr.o slip.o
++OBJ += rpc_api.o rpc_hash.o rpc_misc.o rpc_pkey.o rpc_client.o rpc_server.o
  
  # Object files to build when we're on a platform with direct access
  # to our hardware (Verilog) cores.
@@@ -128,7 -128,7 +129,7 @@@ endi
  #   client-mixed:	Like client-simple but do hashing locally in software and
  #			support a local keystore (for PKCS #11 public keys, etc)
  #
--# RPC_TRANSPORT = loopback | serial | daemon
++# RPC_TRANSPORT = none | loopback | serial | daemon
  #   loopback:		Communicate over loopback socket on Novena
  #   serial:		Communicate over USB in serial pass-through mode
  #   daemon:		Communicate over USB via a daemon, to arbitrate multiple clients
@@@ -138,24 -138,32 +139,22 @@@
  # the C preprocessor: we can use symbolic names so long as they're defined as macros
  # in the C code, but we can't use things like C enum symbols.
  
- ifeq "${RPC_TRANSPORT}" "serial"
-   OBJ += slip.o rpc_serial.o
- else ifeq "${RPC_TRANSPORT}" "daemon"
-   OBJ += slip.o rpc_serial.o
 -ifneq "${RPC_MODE}" "none"
 -  OBJ += rpc_api.o xdr.o
++ifneq "${RPC_MODE}" "server"
++  OBJ += rpc_serial.o
  endif
  
 -ifeq "${RPC_MODE}" "server"
 -  OBJ += slip.o
 -else ifeq "${RPC_TRANSPORT}" "serial"
 -  OBJ += slip.o rpc_serial.o
 -endif
 -
 -RPC_CLIENT_OBJ = rpc_client.o
  ifeq "${RPC_TRANSPORT}" "loopback"
 -  RPC_CLIENT_OBJ += rpc_client_loopback.o
 +  RPC_CLIENT_OBJ = rpc_client_loopback.o
  else ifeq "${RPC_TRANSPORT}" "serial"
 -  RPC_CLIENT_OBJ += rpc_client_serial.o
 +  RPC_CLIENT_OBJ = rpc_client_serial.o
  else ifeq "${RPC_TRANSPORT}" "daemon"
 -  RPC_CLIENT_OBJ += rpc_client_daemon.o
 +  RPC_CLIENT_OBJ = rpc_client_daemon.o
  endif
  
 -RPC_DISPATCH_OBJ = rpc_hash.o rpc_misc.o rpc_pkey.o
 -
 -RPC_SERVER_OBJ = rpc_server.o
  ifeq "${RPC_TRANSPORT}" "loopback"
 -  RPC_SERVER_OBJ += rpc_server_loopback.o
 +  RPC_SERVER_OBJ = rpc_server_loopback.o
  else ifeq "${RPC_TRANSPORT}" "serial"
 -  RPC_SERVER_OBJ += rpc_server_serial.o
 +  RPC_SERVER_OBJ = rpc_server_serial.o
  endif
  
  ifeq "${RPC_MODE}" "none"