diff options
| author | Paul Selkirk <paul@psgd.org> | 2020-03-25 12:26:35 -0400 |
|---|---|---|
| committer | Paul Selkirk <paul@psgd.org> | 2020-03-25 12:26:35 -0400 |
| commit | 275951ed02caba8e7bff4723de9fdb24a5087da5 (patch) | |
| tree | 2a0111411a4f68db26db03ed8f0a600564b970ff | |
| parent | 53517a462d46437767d286a773be363d74297612 (diff) | |
Move keywrap from user/js to core/util, replace aes core in the hsm project.
Also re-order cores to make allocation infinitesimally faster for RSA signing.
| -rw-r--r-- | config/core.cfg | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/config/core.cfg b/config/core.cfg index 65985ca..96cae6c 100644 --- a/config/core.cfg +++ b/config/core.cfg @@ -76,12 +76,8 @@ cores = trng cores = sha256 aes trng modexp mkmif [project hsm] -# Make me one with everything, except we want a lot of modexp for RSA signing -cores = sha1 sha256 sha512 mkmif aes trng modexp modexp modexp modexp ecdsa256 ecdsa384 - -[project hsm-keywrap] -# Make me one with everything, except we want a lot of modexp for RSA signing -cores = sha1 sha256 sha512 mkmif keywrap trng modexp modexp modexp ecdsa256 ecdsa384 +# Make me one with everything +cores = mkmif keywrap modexp trng ecdsa256 ecdsa384 sha1 sha256 sha512 # [core] sections # @@ -355,13 +351,14 @@ vfiles = lib/lowlevel/artix7/dsp48e1_wrapper.v [core keywrap] -# Joachim's experimental AES-keywrap core +# AES-keywrap core requires = aes -core blocks = 32 +parameter ADDR_BITS = 12 +core blocks = 16 block memory = yes error wire = yes module name = keywrap vfiles = - ../user/js/keywrap/src/rtl/keywrap.v - ../user/js/keywrap/src/rtl/keywrap_core.v - ../user/js/keywrap/src/rtl/keywrap_mem.v + util/keywrap/src/rtl/keywrap.v + util/keywrap/src/rtl/keywrap_core.v + util/keywrap/src/rtl/keywrap_mem.v |