[Cryptech-Commits] [core/platform/alpha] 01/01: Merge branch 'js_keywrap' to 'master'

[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 master
in repository core/platform/alpha.

commit b1405d777a71e42bacc12dcdf4b5a81e6ddfd2b3
Merge: ca80f73 8726db6
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Wed Feb 26 13:22:43 2020 -0500

    Merge branch 'js_keywrap' to 'master'

 build/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc build/Makefile
index 27c90ef,2fc9fe0..789ab87
--- a/build/Makefile
+++ b/build/Makefile
@@@ -39,7 -36,7 +39,7 @@@ core_selector.v core_vfiles.mk
  
  # Build some different configurations
  
- bare trng hash mkmif rsa hsm hsm-super hsm_ng:
 -bare trng hash mkmif rsa hsm hsm-super keywrap:
++bare trng hash mkmif rsa hsm hsm-super hsm_ng hsm_ng_keywrap:
  	$(CONFIG_GEN) -p $@
  	$(MAKE) project=$(project)_$@ ucf=$(ucf)