[Cryptech-Commits] [core/platform/common] 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/common.

commit 8a43aa69c947a79bddacb3c9777e3bc23104dad2
Merge: 175bbe0 53b9b7b
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Wed Feb 26 13:20:18 2020 -0500

    Merge branch 'js_keywrap' to 'master'

 config/core.cfg       | 24 ++++++++++++++++++++----
 config/core_config.py |  2 +-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --cc config/core.cfg
index 6efc4af,6520393..697f8bc
--- a/config/core.cfg
+++ b/config/core.cfg
@@@ -91,10 -86,14 +91,14 @@@ cores = sha256 aes trng modexp mkmi
  # Make me one with everything, except we want two modexp cores for parallel CRT
  cores = sha1 sha256 sha512 aes trng modexp modexp mkmif ecdsa256 ecdsa384
  
 -[project keywrap]
 -# for testing Joachim's keywrap core with RSA signing
 -cores = mkmif sha256 aes trng modexp modexp ecdsa256 ecdsa384 keywrap
 +[project hsm_ng]
 +# Make me one with everything, except we want the new ModExpNG core
 +cores = sha1 sha256 sha512 aes trng modexp modexp modexpng mkmif ecdsa256 ecdsa384
  
 -[project keywrap]
 -# for testing Joachim's keywrap core with RSA signing
 -cores = mkmif sha256 aes trng modexp modexp ecdsa256 ecdsa384 keywrap
++[project hsm_ng_keywrap]
++# everything, with the full range of modexp and keywrap options
++cores = sha1 sha256 sha512 aes keywrap trng modexp modexp modexpng mkmif ecdsa256 ecdsa384
+ 
  # [core] sections
  #
  # vfiles: A list of Verilog files to include in the vfiles list when