[Cryptech-Commits] [sw/libhal] 04/04: Rebase branch 'js_keywrap' from 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 js_keywrap
in repository sw/libhal.

commit 411b5a9ee7d28d2bce9b297a865132e39712d93b
Merge: 51d57ab e4fa002
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Tue Apr 9 18:06:24 2019 -0400

    Rebase branch 'js_keywrap' from master.

 hal.h        |  3 +++
 hal_io_fmc.c | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --cc hal.h
index ca96ae6,9986de7..6331e3d
--- a/hal.h
+++ b/hal.h
@@@ -113,14 -104,14 +113,17 @@@
  #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"
  
+ #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.
diff --cc hal_io_fmc.c
index c8d92ec,07f9352..590532b
--- a/hal_io_fmc.c
+++ b/hal_io_fmc.c
@@@ -123,7 -111,12 +123,16 @@@ hal_error_t hal_io_write(const hal_core
    dump("write ", offset + hal_core_base(core), buf, len);
  
    offset = fmc_offset(offset + hal_core_base(core));
++<<<<<<< HEAD
 +  fmc_fpga_memcpy((uint32_t *)fmc_fpga_addr(offset), (uint32_t *)buf, len/4);
++=======
+   for (; len > 0; offset += 4, buf += 4, len -= 4) {
+     uint32_t val;
+     val = htonl(*(uint32_t *)buf);
+     if (fmc_write_32(offset, val) != 0)
+       return HAL_ERROR_IO_TIMEOUT;
+   }
++>>>>>>> e4fa00258cd920d4ea91b024ee007f5b44bac196
  
    return HAL_OK;
  }
@@@ -144,7 -139,12 +153,16 @@@ hal_error_t hal_io_read(const hal_core_
    dump("read  ", offset + hal_core_base(core), buf, len);
  
    offset = fmc_offset(offset + hal_core_base(core));
++<<<<<<< HEAD
 +  fmc_fpga_memcpy((uint32_t *)buf, (uint32_t *)fmc_fpga_addr(offset), len/4);
++=======
+   for (; rlen > 0; offset += 4, rbuf += 4, rlen -= 4) {
+     uint32_t val;
+     if (fmc_read_32(offset, &val) != 0)
+       return HAL_ERROR_IO_TIMEOUT;
+     *(uint32_t *)rbuf = ntohl(val);
+   }
++>>>>>>> e4fa00258cd920d4ea91b024ee007f5b44bac196
  
    return HAL_OK;
  }