diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c b/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c index ae5802316..bdbce0bda 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c @@ -64,10 +64,10 @@ // UART TX Port, Pin, Mux and Baud #ifdef FREESCALE_KSDK_BM - #define UART_PORT LPUART0 /* UART Port */ - #define UART_TX_PORT PORTA /* UART TX Port */ - #define UART_TX_PIN 2U /* UART TX Pin */ - #define UART_TX_MUX kPORT_MuxAlt2 /* Kinetis UART pin mux */ + #define UART_PORT LPUART4 /* UART Port */ + #define UART_TX_PORT PORTC /* UART TX Port */ + #define UART_TX_PIN 15U /* UART TX Pin */ + #define UART_TX_MUX kPORT_MuxAlt3 /* Kinetis UART pin mux */ #elif defined (WOLFSSL_FRDM_K64) #define UART_PORT UART0 /* UART Port */ #define UART_TX_PORT PORTB /* UART TX Port */ @@ -91,7 +91,7 @@ /* Note: TWR-K60 is UART3, PTC17 */ /* Note: FRDM-K64 is UART4, PTE24 or UART0 PTB17 for OpenOCD (SIM_SCGC4_UART0_MASK)*/ /* Note: TWR-K64 is UART5, PTE8 */ -/* Note: FRDM-K82F is LPUART0 A2, LPUART4 PTC15 */ +/* Note: FRDM-K82F is LPUART4 PTC15 Alt3 (OpenOCD UART) */ /***********************************************/ diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp index 5a474b301..2cd93b21f 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp +++ b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp @@ -159,7 +159,6 @@ - @@ -223,8 +222,6 @@ - - diff --git a/wolfcrypt/src/port/nxp/ksdk_port.c b/wolfcrypt/src/port/nxp/ksdk_port.c index 6d601a407..886ddc096 100644 --- a/wolfcrypt/src/port/nxp/ksdk_port.c +++ b/wolfcrypt/src/port/nxp/ksdk_port.c @@ -696,7 +696,7 @@ static int ltc_get_ecc_specs(const uint8_t **modulus, const uint8_t **r2modn, (1==map, 0 == leave in projective) return MP_OKAY on success */ -int wc_ecc_mulmod_ex(mp_int *k, ecc_point *G, ecc_point *R, mp_int* a, +int wc_ecc_mulmod_ex(const mp_int *k, ecc_point *G, ecc_point *R, mp_int* a, mp_int *modulus, int map, void* heap) { ltc_pkha_ecc_point_t B; @@ -726,7 +726,7 @@ int wc_ecc_mulmod_ex(mp_int *k, ecc_point *G, ecc_point *R, mp_int* a, szModulus = mp_unsigned_bin_size(modulus); szkbin = mp_unsigned_bin_size(k); - res = ltc_get_from_mp_int(kbin, k, szkbin); + res = ltc_get_from_mp_int(kbin, (mp_int*)k, szkbin); if (res == MP_OKAY) res = ltc_get_from_mp_int(Gxbin, G->x, szModulus); if (res == MP_OKAY) @@ -768,7 +768,7 @@ int wc_ecc_mulmod_ex(mp_int *k, ecc_point *G, ecc_point *R, mp_int* a, return res; } -int wc_ecc_mulmod_ex2(mp_int* k, ecc_point *G, ecc_point *R, mp_int* a, +int wc_ecc_mulmod_ex2(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a, mp_int* modulus, mp_int* order, WC_RNG* rng, int map, void* heap) { diff --git a/wolfcrypt/src/port/st/stm32.c b/wolfcrypt/src/port/st/stm32.c index 2c23ed48c..dd19797a8 100644 --- a/wolfcrypt/src/port/st/stm32.c +++ b/wolfcrypt/src/port/st/stm32.c @@ -646,7 +646,7 @@ static int stm32_get_ecc_specs(const uint8_t **prime, const uint8_t **coef, (1==map, 0 == leave in projective) return MP_OKAY on success */ -int wc_ecc_mulmod_ex(mp_int *k, ecc_point *G, ecc_point *R, mp_int* a, +int wc_ecc_mulmod_ex(const mp_int *k, ecc_point *G, ecc_point *R, mp_int* a, mp_int *modulus, int map, void* heap) { PKA_ECCMulInTypeDef pka_mul; @@ -725,7 +725,7 @@ int wc_ecc_mulmod_ex(mp_int *k, ecc_point *G, ecc_point *R, mp_int* a, return res; } -int wc_ecc_mulmod_ex2(mp_int* k, ecc_point *G, ecc_point *R, mp_int* a, +int wc_ecc_mulmod_ex2(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a, mp_int* modulus, mp_int* order, WC_RNG* rng, int map, void* heap) {