Fixed SPI defines, fix TPM SHA alignment in header

Author: danielinux

hal/spi/spi_drv_stm32.c

@@ -156,7 +156,7 @@ void spi_init(int polarity, int phase)
         APB2_CLOCK_ER |= SPI1_APB2_CLOCK_ER_VAL;
         spi1_reset();
         SPI1_CR1 = SPI_CR1_MASTER | (5 << 3) | (polarity << 1) | (phase << 0);
-        SPI1_CR2 |= SPI_CR2_SSOE;
+        SPI1_CR2 = SPI_CR2_SSOE | (0x07 << 8);
         SPI1_CR1 |= SPI_CR1_SPI_EN;
     }
 }

hal/spi/spi_drv_stm32.h

@@ -23,9 +23,7 @@
 #define GPIOD_BASE (0x40020C00)
 #define GPIOE_BASE (0x40021000)
 #define SPI_GPIO GPIOB_BASE
-#define SPI_CS_GPIO GPIOB_BASE
-#define SPI_PIO_BASE GPIOB_BASE
-#define SPI_CS_PIO_BASE GPIOE_BASE
+#define SPI_CS_GPIO GPIOE_BASE
 #define SPI_CS_FLASH 1 /* Flash CS connected to GPIOE1 */
 #define SPI_CS_TPM   0 /* TPM CS connected to GPIOE0 */
 #define SPI1_PIN_AF    5 /* Alternate function for SPI pins */

lib/wolfssl

@@ -346,7 +346,7 @@ static int image_hash(struct wolfBoot_image *img, uint8_t *hashBuf)
 {
     const char gUsageAuth[]="wolfBoot TPM Usage Auth";
     uint8_t *stored_sha, *end_sha;
-    uint8_t stored_sha_len;
+    uint16_t stored_sha_len;
     uint8_t *p;
     int blksz;
     uint32_t position = 0;
@@ -364,7 +364,7 @@ static int image_hash(struct wolfBoot_image *img, uint8_t *hashBuf)
         (const byte*)gUsageAuth, sizeof(gUsageAuth)-1);
     if (rc != 0)
         return -1;
-    end_sha = stored_sha - 2;
+    end_sha = stored_sha - 4;
     while (p < end_sha) {
         blksz = SHA256_BLOCK_SIZE;
         if (end_sha - p < blksz)