Switch to libhal's CRC-32 code.

11 files changed, 44 insertions, 222 deletions

diff --git a/projects/bootloader/Makefile b/projects/bootloader/Makefile
index 8415c69..fe96982 100644
--- a/projects/bootloader/Makefile
+++ b/projects/bootloader/Makefile
@@ -1,6 +1,6 @@
 PROG = bootloader
 
-OBJS = crc32.o dfu.o log.o
+OBJS = dfu.o log.o
 
 BOARD_OBJS = \
 	./stm-init.o \
diff --git a/projects/bootloader/crc32.c b/projects/bootloader/crc32.c
deleted file mode 100644
index 4d1a0bc..0000000
--- a/projects/bootloader/crc32.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Reference code from RFC1952. Not meant to be used outside test code. */
-
-#include "stm32f4xx_hal.h"
-
-
-/* Table of CRCs of all 8-bit messages. */
-unsigned long crc_table[256];
-
-/* Flag: has the table been computed? Initially false. */
-int crc_table_computed = 0;
-
-/* Make the table for a fast CRC. */
-void make_crc_table(void)
-{
-    unsigned long c;
-
-    int n, k;
-    for (n = 0; n < 256; n++) {
-	c = (unsigned long) n;
-	for (k = 0; k < 8; k++) {
-	    if (c & 1) {
-		c = 0xedb88320L ^ (c >> 1);
-	    } else {
-		c = c >> 1;
-	    }
-	}
-	crc_table[n] = c;
-    }
-    crc_table_computed = 1;
-}
-
-/*
-  Update a running crc with the bytes buf[0..len-1] and return
-  the updated crc. The crc should be initialized to zero. Pre- and
-  post-conditioning (one's complement) is performed within this
-  function so it shouldn't be done by the caller. Usage example:
-
-  unsigned long crc = 0L;
-
-  while (read_buffer(buffer, length) != EOF) {
-  crc = update_crc(crc, buffer, length);
-  }
-  if (crc != original_crc) error();
-*/
-uint32_t update_crc(uint32_t crc, uint8_t *buf, int len)
-{
-    unsigned long c = crc ^ 0xffffffffL;
-    int n;
-
-    if (!crc_table_computed)
-	make_crc_table();
-    for (n = 0; n < len; n++) {
-	c = crc_table[(c ^ buf[n]) & 0xff] ^ (c >> 8);
-    }
-    return c ^ 0xffffffffL;
-}
-
-/* Return the CRC of the bytes buf[0..len-1]. */
-unsigned long crc(unsigned char *buf, int len)
-{
-    return update_crc(0L, buf, len);
-}
diff --git a/projects/bootloader/dfu.c b/projects/bootloader/dfu.c
index f4a9cf9..a0ff372 100644
--- a/projects/bootloader/dfu.c
+++ b/projects/bootloader/dfu.c
@@ -47,8 +47,6 @@
 
 #include <string.h>
 
-extern uint32_t update_crc(uint32_t crc, uint8_t *buf, int len);
-
 static int getline(char *buf, int len)
 {
     int i;
@@ -111,8 +109,9 @@ static int do_login(void)
 
 int dfu_receive_firmware(void)
 {
-    uint32_t filesize = 0, crc = 0, my_crc = 0, counter = 0;
     uint32_t offset = DFU_FIRMWARE_ADDR, n = DFU_UPLOAD_CHUNK_SIZE;
+    hal_crc32_t crc = 0, my_crc = hal_crc32_init();
+    uint32_t filesize = 0, counter = 0;
     uint8_t buf[DFU_UPLOAD_CHUNK_SIZE];
 
     if (do_login() != 0)
@@ -133,7 +132,7 @@ int dfu_receive_firmware(void)
     uart_send_string2(STM_UART_MGMT, "OK, write size (4 bytes), data in 4096 byte chunks, CRC-32 (4 bytes)\r\n");
 
     /* Read file size (4 bytes) */
-    uart_receive_bytes(STM_UART_MGMT, (void *) &filesize, 4, 10000);
+    uart_receive_bytes(STM_UART_MGMT, (void *) &filesize, sizeof(filesize), 10000);
     if (filesize < 512 || filesize > DFU_FIRMWARE_END_ADDR - DFU_FIRMWARE_ADDR) {
         uart_send_string2(STM_UART_MGMT, "Invalid filesize ");
         uart_send_number2(STM_UART_MGMT, filesize, 1, 10);
@@ -165,7 +164,7 @@ int dfu_receive_firmware(void)
 	/* After reception of a chunk but before ACKing we have "all" the time in the world to
 	 * calculate CRC and write it to flash.
 	 */
-	my_crc = update_crc(my_crc, buf, n);
+	my_crc = hal_crc32_update(my_crc, buf, n);
 	stm_flash_write32(offset, (uint32_t *)buf, sizeof(buf)/4);
 	offset += DFU_UPLOAD_CHUNK_SIZE;
 
@@ -175,12 +174,14 @@ int dfu_receive_firmware(void)
 	led_toggle(LED_BLUE);
     }
 
+    my_crc = hal_crc32_finalize(my_crc);
+
     HAL_FLASH_Lock();
 
     uart_send_string2(STM_UART_MGMT, "Send CRC-32\r\n");
 
     /* The sending side will now send its calculated CRC-32 */
-    uart_receive_bytes(STM_UART_MGMT, (void *) &crc, 4, 10000);
+    uart_receive_bytes(STM_UART_MGMT, (void *) &crc, sizeof(crc), 10000);
 
     uart_send_string2(STM_UART_MGMT, "CRC-32 0x");
     uart_send_number2(STM_UART_MGMT, crc, 1, 16);
diff --git a/projects/cli-test/Makefile b/projects/cli-test/Makefile
index 1f7faf1..22c8133 100644
--- a/projects/cli-test/Makefile
+++ b/projects/cli-test/Makefile
@@ -1,7 +1,6 @@
 TEST = cli-test
 
 OBJS = \
-	crc32.o \
 	mgmt-cli.o \
 	mgmt-dfu.o \
 	mgmt-fpga.o \
diff --git a/projects/cli-test/crc32.c b/projects/cli-test/crc32.c
deleted file mode 100644
index 4d1a0bc..0000000
--- a/projects/cli-test/crc32.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Reference code from RFC1952. Not meant to be used outside test code. */
-
-#include "stm32f4xx_hal.h"
-
-
-/* Table of CRCs of all 8-bit messages. */
-unsigned long crc_table[256];
-
-/* Flag: has the table been computed? Initially false. */
-int crc_table_computed = 0;
-
-/* Make the table for a fast CRC. */
-void make_crc_table(void)
-{
-    unsigned long c;
-
-    int n, k;
-    for (n = 0; n < 256; n++) {
-	c = (unsigned long) n;
-	for (k = 0; k < 8; k++) {
-	    if (c & 1) {
-		c = 0xedb88320L ^ (c >> 1);
-	    } else {
-		c = c >> 1;
-	    }
-	}
-	crc_table[n] = c;
-    }
-    crc_table_computed = 1;
-}
-
-/*
-  Update a running crc with the bytes buf[0..len-1] and return
-  the updated crc. The crc should be initialized to zero. Pre- and
-  post-conditioning (one's complement) is performed within this
-  function so it shouldn't be done by the caller. Usage example:
-
-  unsigned long crc = 0L;
-
-  while (read_buffer(buffer, length) != EOF) {
-  crc = update_crc(crc, buffer, length);
-  }
-  if (crc != original_crc) error();
-*/
-uint32_t update_crc(uint32_t crc, uint8_t *buf, int len)
-{
-    unsigned long c = crc ^ 0xffffffffL;
-    int n;
-
-    if (!crc_table_computed)
-	make_crc_table();
-    for (n = 0; n < len; n++) {
-	c = crc_table[(c ^ buf[n]) & 0xff] ^ (c >> 8);
-    }
-    return c ^ 0xffffffffL;
-}
-
-/* Return the CRC of the bytes buf[0..len-1]. */
-unsigned long crc(unsigned char *buf, int len)
-{
-    return update_crc(0L, buf, len);
-}
diff --git a/projects/cli-test/mgmt-dfu.c b/projects/cli-test/mgmt-dfu.c
index 851c8ea..5c9b4b7 100644
--- a/projects/cli-test/mgmt-dfu.c
+++ b/projects/cli-test/mgmt-dfu.c
@@ -45,8 +45,6 @@
 #define DFU_UPLOAD_CHUNK_SIZE     256
 #define HARDWARE_EARLY_DFU_JUMP   0xBADABADA
 
-extern uint32_t update_crc(uint32_t crc, uint8_t *buf, int len);
-
 /* Linker symbols are strange in C. Make regular pointers for sanity. */
 __IO uint32_t *dfu_control = &CRYPTECH_DFU_CONTROL;
 __IO uint32_t *dfu_firmware = &CRYPTECH_FIRMWARE_START;
diff --git a/projects/cli-test/mgmt-keystore.c b/projects/cli-test/mgmt-keystore.c
index 6e26d6d..e11ef76 100644
--- a/projects/cli-test/mgmt-keystore.c
+++ b/projects/cli-test/mgmt-keystore.c
@@ -33,17 +33,17 @@
  */
 
 /* Rename both CMSIS HAL_OK and libhal HAL_OK to disambiguate */
+
 #define HAL_OK CMSIS_HAL_OK
 #include "stm-init.h"
 #include "stm-keystore.h"
 #include "stm-fpgacfg.h"
 #include "stm-uart.h"
-
 #include "mgmt-cli.h"
 #include "mgmt-show.h"
-
 #undef HAL_OK
-#define LIBHAL_OK HAL_OK
+
+#define HAL_OK LIBHAL_OK
 #include "hal.h"
 #warning Really should not be including hal_internal.h here, fix API instead of bypassing it
 #include "hal_internal.h"
diff --git a/projects/cli-test/mgmt-misc.c b/projects/cli-test/mgmt-misc.c
index b7b4fcc..7db08f2 100644
--- a/projects/cli-test/mgmt-misc.c
+++ b/projects/cli-test/mgmt-misc.c
@@ -32,28 +32,32 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define HAL_OK CMSIS_HAL_OK
 #include "stm-init.h"
 #include "stm-uart.h"
-
 #include "mgmt-cli.h"
 #include "mgmt-misc.h"
+#undef HAL_OK
 
-#include <string.h>
-
+#define HAL_OK LIBHAL_OK
+#include "hal.h"
+#include "hal_internal.h"
+#undef HAL_OK
 
-extern uint32_t update_crc(uint32_t crc, uint8_t *buf, int len);
+#include <string.h>
 
 
-static volatile uint32_t demo_crc = 0;
+static volatile hal_crc32_t demo_crc;
 
 static int _count_bytes_callback(uint8_t *buf, size_t len) {
-    demo_crc = update_crc(demo_crc, buf, len);
+    demo_crc = hal_crc32_update(demo_crc, buf, len);
     return 1;
 }
 
 int cli_receive_data(struct cli_def *cli, uint8_t *buf, size_t len, cli_data_callback data_callback)
 {
-    uint32_t filesize = 0, crc = 0, my_crc = 0, counter = 0;
+    hal_crc32_t crc = 0, my_crc = hal_crc32_init();
+    uint32_t filesize = 0, counter = 0;
     size_t n = len;
 
     if (! control_mgmt_uart_dma_rx(DMA_RX_STOP)) {
@@ -63,7 +67,7 @@ int cli_receive_data(struct cli_def *cli, uint8_t *buf, size_t len, cli_data_cal
 
     cli_print(cli, "OK, write size (4 bytes), data in %li byte chunks, CRC-32 (4 bytes)", (uint32_t) n);
 
-    if (uart_receive_bytes(STM_UART_MGMT, (void *) &filesize, 4, 1000) != HAL_OK) {
+    if (uart_receive_bytes(STM_UART_MGMT, (void *) &filesize, sizeof(filesize), 1000) != CMSIS_HAL_OK) {
 	cli_print(cli, "Receive timed out");
 	goto fail;
     }
@@ -78,12 +82,12 @@ int cli_receive_data(struct cli_def *cli, uint8_t *buf, size_t len, cli_data_cal
 
 	if (filesize < n) n = filesize;
 
-	if (uart_receive_bytes(STM_UART_MGMT, (void *) buf, n, 1000) != HAL_OK) {
+	if (uart_receive_bytes(STM_UART_MGMT, (void *) buf, n, 1000) != CMSIS_HAL_OK) {
 	    cli_print(cli, "Receive timed out");
 	    goto fail;
 	}
 	filesize -= n;
-	my_crc = update_crc(my_crc, buf, n);
+	my_crc = hal_crc32_update(my_crc, buf, n);
 
 	/* After reception of a chunk but before ACKing we have "all" the time in the world to
 	 * calculate CRC and invoke the data_callback.
@@ -97,8 +101,9 @@ int cli_receive_data(struct cli_def *cli, uint8_t *buf, size_t len, cli_data_cal
 	uart_send_bytes(STM_UART_MGMT, (void *) &counter, 4);
     }
 
+    my_crc = hal_crc32_finalize(my_crc);
     cli_print(cli, "Send CRC-32");
-    uart_receive_bytes(STM_UART_MGMT, (void *) &crc, 4, 1000);
+    uart_receive_bytes(STM_UART_MGMT, (void *) &crc, sizeof(crc), 1000);
     cli_print(cli, "CRC-32 0x%x, calculated CRC 0x%x", (unsigned int) crc, (unsigned int) my_crc);
     if (crc == my_crc) {
 	cli_print(cli, "CRC checksum MATCHED");
@@ -115,8 +120,9 @@ static int cmd_filetransfer(struct cli_def *cli, const char *command, char *argv
 {
     uint8_t buf[FILETRANSFER_UPLOAD_CHUNK_SIZE];
 
-    demo_crc = 0;
+    demo_crc = hal_crc32_init();
     cli_receive_data(cli, &buf[0], sizeof(buf), _count_bytes_callback);
+    demo_crc = hal_crc32_finalize(demo_crc);
     cli_print(cli, "Demo CRC is: %li/0x%x", demo_crc, (unsigned int) demo_crc);
     return CLI_OK;
 }
diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile
index 56ee462..6f941cf 100644
--- a/projects/hsm/Makefile
+++ b/projects/hsm/Makefile
@@ -1,8 +1,7 @@
 PROJ = hsm
 
 # objs in addition to $(PROJ).o
-OBJS = crc32.o \
-	mgmt-cli.o \
+OBJS =	mgmt-cli.o \
 	mgmt-firmware.c \
 	mgmt-bootloader.c \
 	mgmt-fpga.c \
diff --git a/projects/hsm/crc32.c b/projects/hsm/crc32.c
deleted file mode 100644
index 4d1a0bc..0000000
--- a/projects/hsm/crc32.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Reference code from RFC1952. Not meant to be used outside test code. */
-
-#include "stm32f4xx_hal.h"
-
-
-/* Table of CRCs of all 8-bit messages. */
-unsigned long crc_table[256];
-
-/* Flag: has the table been computed? Initially false. */
-int crc_table_computed = 0;
-
-/* Make the table for a fast CRC. */
-void make_crc_table(void)
-{
-    unsigned long c;
-
-    int n, k;
-    for (n = 0; n < 256; n++) {
-	c = (unsigned long) n;
-	for (k = 0; k < 8; k++) {
-	    if (c & 1) {
-		c = 0xedb88320L ^ (c >> 1);
-	    } else {
-		c = c >> 1;
-	    }
-	}
-	crc_table[n] = c;
-    }
-    crc_table_computed = 1;
-}
-
-/*
-  Update a running crc with the bytes buf[0..len-1] and return
-  the updated crc. The crc should be initialized to zero. Pre- and
-  post-conditioning (one's complement) is performed within this
-  function so it shouldn't be done by the caller. Usage example:
-
-  unsigned long crc = 0L;
-
-  while (read_buffer(buffer, length) != EOF) {
-  crc = update_crc(crc, buffer, length);
-  }
-  if (crc != original_crc) error();
-*/
-uint32_t update_crc(uint32_t crc, uint8_t *buf, int len)
-{
-    unsigned long c = crc ^ 0xffffffffL;
-    int n;
-
-    if (!crc_table_computed)
-	make_crc_table();
-    for (n = 0; n < len; n++) {
-	c = crc_table[(c ^ buf[n]) & 0xff] ^ (c >> 8);
-    }
-    return c ^ 0xffffffffL;
-}
-
-/* Return the CRC of the bytes buf[0..len-1]. */
-unsigned long crc(unsigned char *buf, int len)
-{
-    return update_crc(0L, buf, len);
-}
diff --git a/projects/hsm/mgmt-misc.c b/projects/hsm/mgmt-misc.c
index 250dc7a..1861304 100644
--- a/projects/hsm/mgmt-misc.c
+++ b/projects/hsm/mgmt-misc.c
@@ -32,21 +32,25 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define HAL_OK CMSIS_HAL_OK
 #include "stm-init.h"
 #include "stm-uart.h"
-
 #include "mgmt-cli.h"
 #include "mgmt-misc.h"
+#undef HAL_OK
 
-#include <string.h>
-
+#define HAL_OK LIBHAL_OK
+#include "hal.h"
+#include "hal_internal.h"
+#undef HAL_OK
 
-extern uint32_t update_crc(uint32_t crc, uint8_t *buf, int len);
+#include <string.h>
 
 
 int cli_receive_data(struct cli_def *cli, uint8_t *buf, size_t len, cli_data_callback data_callback)
 {
-    uint32_t filesize = 0, crc = 0, my_crc = 0, counter = 0;
+    hal_crc32_t crc = 0, my_crc = hal_crc32_init();
+    uint32_t filesize = 0, counter = 0;
     size_t n = len;
 
     if (! control_mgmt_uart_dma_rx(DMA_RX_STOP)) {
@@ -56,7 +60,7 @@ int cli_receive_data(struct cli_def *cli, uint8_t *buf, size_t len, cli_data_cal
 
     cli_print(cli, "OK, write size (4 bytes), data in %li byte chunks, CRC-32 (4 bytes)", (uint32_t) n);
 
-    if (uart_receive_bytes(STM_UART_MGMT, (void *) &filesize, 4, 1000) != HAL_OK) {
+    if (uart_receive_bytes(STM_UART_MGMT, (void *) &filesize, sizeof(filesize), 1000) != CMSIS_HAL_OK) {
 	cli_print(cli, "Receive timed out");
 	goto fail;
     }
@@ -71,12 +75,12 @@ int cli_receive_data(struct cli_def *cli, uint8_t *buf, size_t len, cli_data_cal
 
 	if (filesize < n) n = filesize;
 
-	if (uart_receive_bytes(STM_UART_MGMT, (void *) buf, n, 1000) != HAL_OK) {
+	if (uart_receive_bytes(STM_UART_MGMT, (void *) buf, n, 1000) != CMSIS_HAL_OK) {
 	    cli_print(cli, "Receive timed out");
 	    goto fail;
 	}
 	filesize -= n;
-	my_crc = update_crc(my_crc, buf, n);
+	my_crc = hal_crc32_update(my_crc, buf, n);
 
 	/* After reception of a chunk but before ACKing we have "all" the time in the world to
 	 * calculate CRC and invoke the data_callback.
@@ -90,8 +94,9 @@ int cli_receive_data(struct cli_def *cli, uint8_t *buf, size_t len, cli_data_cal
 	uart_send_bytes(STM_UART_MGMT, (void *) &counter, 4);
     }
 
+    my_crc = hal_crc32_finalize(my_crc);
     cli_print(cli, "Send CRC-32");
-    uart_receive_bytes(STM_UART_MGMT, (void *) &crc, 4, 1000);
+    uart_receive_bytes(STM_UART_MGMT, (void *) &crc, sizeof(crc), 1000);
     cli_print(cli, "CRC-32 0x%x, calculated CRC 0x%x", (unsigned int) crc, (unsigned int) my_crc);
     if (crc == my_crc) {
 	cli_print(cli, "CRC checksum MATCHED");