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

[git at cryptech.is]

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

paul at psgd.org pushed a commit to branch rpc
in repository sw/libhal.

commit 01f5452659c34e5232bcb534e14e45b0c430047e
Merge: cdaf07d cf04c6c
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Mon Mar 21 23:04:59 2016 -0400

    Merge branch 'master' into rpc

 .gitignore            |   1 +
 GNUmakefile           |   2 +-
 asn1.c                |   3 +-
 ecdsa.c               |   2 +-
 hash.c                | 104 +++++++--------
 ks.c                  |   1 +
 ks_mmap.c             |   1 +
 ks_volatile.c         |   1 +
 rpc_pkey.c            |  36 +++++-
 tests/GNUmakefile     |   2 +-
 tests/test-hash.c     |   6 -
 tests/test-rpc_hash.c |   2 +
 tests/test-rpc_pkey.c | 348 ++++++++++++++++++++++++++++++++++++++++++++++++++
 13 files changed, 436 insertions(+), 73 deletions(-)

diff --cc GNUmakefile
index 75bcf44,638a65a..a4154af
--- a/GNUmakefile
+++ b/GNUmakefile
@@@ -145,18 -67,10 +145,18 @@@ endi
  # 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}
 +KS_OBJ = ks.o
 +KS ?= mmap
 +ifeq (${KS},mmap)
 +  KS_OBJ += ks_mmap.o
 +else ifeq (${KS},volatile)
 +  KS_OBJ += ks_volatile.o
 +else ifeq (${KS},flash)
 +  KS_OBJ += ks_flash.o
 +endif
  
  TFMDIR		:= $(abspath ../thirdparty/libtfm)
- CFLAGS		+= -g3 -Wall -std=c99 -I${TFMDIR} -DHAL_ECDSA_DEBUG_ONLY_STATIC_TEST_VECTOR_RANDOM=1
 -CFLAGS		+= -g3 -Wall -fPIC -std=c99 -I${TFMDIR}
++CFLAGS		+= -g3 -Wall -std=c99 -I${TFMDIR}
  LDFLAGS		:= -g3 -L${TFMDIR} -ltfm
  
  CFLAGS		+= -DHAL_STATIC_HASH_STATE_BLOCKS=${STATIC_HASH_STATE_BLOCKS}
diff --cc tests/GNUmakefile
index 0fa6281,4bb5f72..63db700
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@@ -29,22 -29,8 +29,22 @@@
  
  INC	= ../hal.h
  LIB	= ../libhal.a
 -BIN	= test-aes-key-wrap test-hash test-pbkdf2 test-ecdsa test-bus test-trng test-rsa
 -BIN	+= test-rpc_hash test-rpc_server test-rpc_pkey
 +BIN	:= test-aes-key-wrap test-hash test-pbkdf2 test-ecdsa test-bus test-trng test-rsa
 +ifndef RPC_SERVER
 +  ifdef RPC_CLIENT
 +    ifneq (${RPC_CLIENT},local)
 +      # If we're only building a remote RPC client lib, don't include
 +      # tests that access the FPGA cores.
 +      BIN :=
 +    endif
 +  endif
 +endif
 +ifdef RPC_CLIENT
-   BIN	+= test-rpc_hash test-rpc_get_version
++  BIN	+= test-rpc_hash test-rpc_pkey test-rpc_get_version
 +endif
 +ifdef RPC_SERVER
 +  BIN	+= test-rpc_server
 +endif
  
  CFLAGS	= -g3 -Wall -fPIC -std=c99 -I..