[Cryptech-Commits] [sw/libhal] 03/04: 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 sw/libhal.

commit b983fd7369f0c09cf80657d25dc37bfce38b9606
Merge: f5cbba5 e4fa002
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Wed Feb 26 14:06:16 2020 -0500

    Merge branch 'js_keywrap' to 'master'

 aes_keywrap.c       | 176 +++++++++++++++++++++++++++++++++++++++++-----------
 core.c              |   1 +
 hal.h               |   5 ++
 verilog_constants.h |  25 ++++++++
 4 files changed, 172 insertions(+), 35 deletions(-)

diff --cc aes_keywrap.c
index 144ad68,a3e223f..b849304
--- a/aes_keywrap.c
+++ b/aes_keywrap.c
@@@ -4,8 -4,8 +4,9 @@@
   * Implementation of RFC 5649 over Cryptech AES core.
   *
   * Authors: Rob Austein
-  * Copyright (c) 2015-2017, NORDUnet A/S
 - * Copyright (c) 2015-2018, NORDUnet A/S
-- * All rights reserved.
++ * Copyright (c) 2015-2018, NORDUnet A/S All rights reserved.
++ * Copyright: 2020, The Commons Conservancy Cryptech Project
++ * SPDX-License-Identifier: BSD-3-Clause
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions are
@@@ -17,9 -17,9 +18,9 @@@
   *   notice, this list of conditions and the following disclaimer in the
   *   documentation and/or other materials provided with the distribution.
   *
-- * - Neither the name of the NORDUnet nor the names of its contributors may
-- *   be used to endorse or promote products derived from this software
-- *   without specific prior written permission.
++ * - Neither the name of the copyright holder nor the names of its
++ *   contributors may be used to endorse or promote products derived from
++ *   this software without specific prior written permission.
   *
   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
   * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --cc core.c
index 449b171,2b5d51a..7e49d25
--- a/core.c
+++ b/core.c
@@@ -103,7 -101,7 +103,8 @@@ static inline hal_core_t *probe_cores(v
      { "csprng",  11 * CORE_SIZE }, /* empty slots after csprng */
      { "modexps6", 3 * CORE_SIZE }, /* ModexpS6 uses four slots */
      { "modexpa7", 7 * CORE_SIZE }, /* ModexpA7 uses eight slots */
 -    { "key wrap",31 * CORE_SIZE }, /* keywrap uses 32 slots */
 +    { "modexpng", 15 * CORE_SIZE }, /* ModexpNG uses 16 slots */
++    { "key wrap", 31 * CORE_SIZE }, /* keywrap uses 32 slots */
    };
  
    if (offsetof(hal_core_t, info) != 0)
diff --cc hal.h
index 2bf97a6,9986de7..be49f67
--- a/hal.h
+++ b/hal.h
@@@ -118,11 -104,14 +118,14 @@@
  #define MKMIF_VERSION           "0.10"
  
  #define ECDSA256_NAME           "ecdsa256"
 -#define ECDSA256_VERSION        "0.11"
 +#define ECDSA256_VERSION        "0.20"
  
  #define ECDSA384_NAME           "ecdsa384"
 -#define ECDSA384_VERSION        "0.11"
 +#define ECDSA384_VERSION        "0.20"
  
+ #define KEYWRAP_NAME            "key wrap"
+ #define KEYWRAP_VERSION         "0.70"
+ 
  /*
   * C API error codes.  Defined in this form so we can keep the tokens
   * and error strings together.  See errorstrings.c.