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

[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 rpc
in repository sw/libhal.

commit cf04c6c34994f545cbf509a6de4aed096e48aa61
Merge: cddc061 906263d
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Sat Mar 12 15:21:34 2016 -0500

    Merge branch 'master' into rpc

 GNUmakefile | 2 +-
 ecdsa.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc GNUmakefile
index 0637f76,2a11683..638a65a
--- a/GNUmakefile
+++ b/GNUmakefile
@@@ -46,37 -38,10 +46,37 @@@ IO_OBJ_I2C 	= hal_io_i2c.
  # Default I/O bus is EIM, override this to use I2C instead
  IO_OBJ		= ${IO_OBJ_EIM}
  
 +RPC_OBJ_COMMON	= rpc_api.o rpc_hash.o rpc_misc.o rpc_pkey.o rpc_xdr.o
 +RPC_OBJ_CLIENT	= rpc_client.o rpc_client_loopback.o
 +RPC_OBJ_SERVER	= rpc_server.o rpc_server_loopback.o
 +
 +# Default should be to build the RPC server code. We'll probably end up
 +# needing a makefile conditional to handle all this properly.
 +RPC_OBJ		= ${RPC_OBJ_COMMON} ${RPC_OBJ_CLIENT} ${RPC_OBJ_SERVER}
 +
 +KS_OBJ_COMMON	= ks.o
 +KS_OBJ_MMAP	= ${KS_OBJ_COMMON} ks_mmap.o
 +KS_OBJ_VOLATILE	= ${KS_OBJ_COMMON} ks_volatile.o
 +KS_OBJ_FLASH	= ${KS_OBJ_COMMON} ks_flash.o
 +
 +# The mmap and flash keystore implementations are both server code.
 +#
 +# The volatile keystore (conventional memory) is client code, to
 +# support using the same API for things like PKCS #11 "session" objects.
 +#
 +# Default at the moment is mmap, since that should work on the Novena
 +# and we haven't yet written the flash code for the bridge board.
 +
 +KS_OBJ		= ${KS_OBJ_MMAP}
 +
  TFMDIR		:= $(abspath ../thirdparty/libtfm)
- CFLAGS		+= -g3 -Wall -fPIC -std=c99 -I${TFMDIR} -DHAL_ECDSA_DEBUG_ONLY_STATIC_TEST_VECTOR_RANDOM=1
+ CFLAGS		+= -g3 -Wall -fPIC -std=c99 -I${TFMDIR}
  LDFLAGS		:= -g3 -L${TFMDIR} -ltfm
  
 +CFLAGS		+= -DHAL_STATIC_HASH_STATE_BLOCKS=${STATIC_HASH_STATE_BLOCKS}
 +CFLAGS		+= -DHAL_STATIC_HMAC_STATE_BLOCKS=${STATIC_HMAC_STATE_BLOCKS}
 +CFLAGS		+= -DHAL_STATIC_PKEY_STATE_BLOCKS=${STATIC_PKEY_STATE_BLOCKS}
 +
  all: ${LIB}
  	cd tests; ${MAKE} CFLAGS='${CFLAGS} -I..' LDFLAGS='${LDFLAGS}' $@
  	cd utils; ${MAKE} CFLAGS='${CFLAGS} -I..' LDFLAGS='${LDFLAGS}' $@