From 2663f5abaf343083243e81bae552ef60c46abec7 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@wolfssl.com>
Date: Thu, 7 Apr 2022 11:07:27 +0100
Subject: [PATCH 1/5] Add IAR MSP430 example

A basic MSP430 example for IAR IDE.
---
 IDE/IAR-MSP430/README.md       |  27 +++
 IDE/IAR-MSP430/main.c          | 325 +++++++++++++++++++++++++++++++++
 IDE/IAR-MSP430/user_settings.h | 134 ++++++++++++++
 3 files changed, 486 insertions(+)
 create mode 100644 IDE/IAR-MSP430/README.md
 create mode 100644 IDE/IAR-MSP430/main.c
 create mode 100644 IDE/IAR-MSP430/user_settings.h

diff --git a/IDE/IAR-MSP430/README.md b/IDE/IAR-MSP430/README.md
new file mode 100644
index 000000000..8dbef748c
--- /dev/null
+++ b/IDE/IAR-MSP430/README.md
@@ -0,0 +1,27 @@
+# MSP430 Example
+
+This example was designed to be used with the MSP430F5359/MSP430F5659 but can be ported to any similar MSP platform. It will take ~50KB of ROM space and a 8KB of statically allocated RAM (nearly half for constants).
+
+The example runs at 8MHz and executes a benchmark of ECC key generations, shared secrets and 1KB ChaCha20/Poly1305 encryption.
+
+At 8MHz the ECC steps will take 13-15 seconds each and 1000 iterations of ChaCha20/Poly1305 will take about 45 seconds.
+
+## Hardware Setup
+
+A basic development board / ISP combination will work fine, such as the MSP-TS430PZ100 series with the MSP-FET430 series programmer.
+
+The example will output text via UART 1, on the MSP430 which is port 8 bits 2&3 (pins 60/61) on the MSP430F5359. The UART will run at 57600 baud.
+
+In addition every second port 1 bit 1 will be toggled on/off (typically an LED would be here).
+
+## IDE setup
+
+When setting up the IDE, copy the wolfSSL source code to your project's directory and add all the .c and .h files from `wolfcrypt/src` to your project.
+
+Use the `main.c` provided here and copy the `user_settings.h` file to the `wolfssl/wolfcrypt` subdirectory of wolfSSL.
+
+You will need to set at least 700 bytes of stack, no heap is required. It will need the memory model to set to "medium". You will also need to change the "Library Configuration" to "Full DLIB" so the `printf()` functions work correctly.
+
+Make sure to add the definition `WOLFSSL_USER_SETTINGS` to the preprocessor settings in your project to that `user_settings.h` is loaded in. You will also need to add the wolfSSL root directory to the "Additional include directories".
+
+From here you can set any optimizer settings you need.
diff --git a/IDE/IAR-MSP430/main.c b/IDE/IAR-MSP430/main.c
new file mode 100644
index 000000000..68e2f1b4d
--- /dev/null
+++ b/IDE/IAR-MSP430/main.c
@@ -0,0 +1,325 @@
+/* MSP430 example main.c
+ *
+ * Copyright (C) 2022 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+#include <wolfssl/wolfcrypt/settings.h>
+
+#include <wolfssl/wolfcrypt/wc_port.h>
+#include <wolfssl/wolfcrypt/types.h>
+#include <wolfssl/wolfcrypt/random.h>
+#include <wolfssl/wolfcrypt/ecc.h>
+#include <wolfssl/wolfcrypt/curve25519.h>
+#include <wolfssl/wolfcrypt/curve448.h>
+#include <wolfssl/wolfcrypt/chacha20_poly1305.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include <msp430f5359.h>
+
+#define ECC_256_BIT_FIELD 32 /* 256-bit curve field */
+#define ECC_448_BIT_FIELD 56 /* 448-bit curve field */
+
+#define WOLF_GEN_MEM         (2*1024)
+
+static byte gWolfMem[WOLF_GEN_MEM];
+static byte generatedCiphertext[1024];
+static byte generatedPlaintext[1024];
+
+#define MCLK_FREQ_MHZ 8 /* MCLK = 8MHz */
+
+const byte  key[] = {
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+    0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f
+};
+
+const byte plaintext[] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras lacus odio, pretium vel sagittis ac, facilisis quis diam. Vivamus condimentum velit sed dolor consequat interdum. Etiam eleifend ornare felis, eleifend egestas odio vulputate eu. Sed nec orci nunc. Etiam quis mi augue. Donec ullamcorper suscipit lorem, vel luctus augue cursus fermentum. Etiam a porta arcu, in convallis sem. Integer efficitur elementum diam, vel scelerisque felis posuere placerat. Donec vestibulum sit amet leo sit amet tincidunt. Etiam et vehicula turpis. Phasellus quis finibus sapien. Sed et tristique turpis. Nullam vitae sagittis tortor, et aliquet lorem. Cras a leo scelerisque, convallis lacus ut, fermentum urna. Mauris quis urna diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam aliquam vehicula orci id pulvinar. Proin mollis, libero sollicitudin tempor ultrices, massa augue tincidunt turpis, sit amet aliquam neque nibh nec dui. Fusce finibus massa quis rutrum suscipit cras amet";
+
+const byte  iv[] = {
+    0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43,
+    0x44, 0x45, 0x46, 0x47
+};
+
+const byte  aad[] = { /* additional data */
+    0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3,
+    0xc4, 0xc5, 0xc6, 0xc7
+};
+
+volatile unsigned int seconds;
+
+/* Add __root here (and a few other places) otherwise this is optimized out */
+__root unsigned int msp430_time(long *x)
+{
+    return seconds;
+}
+
+static void print_secret(char* who, byte* s, int sLen)
+{
+    int i;
+    printf("%ss' Secret: ", who);
+    for (i = 0; i < sLen; i++) {
+        printf("%02x", s[i]);
+    }
+    printf("\r\n");
+}
+
+/* This is a very crude RNG, do not use in production */
+__root unsigned int msp430_rnd(void)
+{
+    unsigned int result = TA0R % TA2R;
+    printf("Rand generated: %d\r\n", result);
+    return result;
+}
+
+static void uart_init()
+{
+    P8SEL |= BIT3 + BIT2;
+    UCA1CTLW0 = UCSWRST;                      // Put eUSCI in reset
+    UCA1CTLW0 |= UCSSEL__SMCLK;               // CLK = SMCLK
+    /* Baud Rate calculation
+       This was calculated to produce 115200 for a 16MHz clock, so it produces
+       57600 at 8MHz
+       16000000/(16*115200) = 8.6805
+       Fractional portion = 0.6805
+       Use Table 24-5 in Family User Guide
+    */
+    UCA1BR0 = 8;                               // 16000000/16/9600
+    UCA1BR1 = 0x00;
+    UCA1MCTL |= UCOS16 | UCBRF_11 | UCBRS_0;
+    UCA1CTLW0 &= ~UCSWRST;                    // Initialize eUSCI
+    UCA1IE |= UCRXIE;                         // Enable USCI_A0 RX interrupt
+}
+
+__root size_t __write(int fd, const unsigned char *_ptr, size_t len)
+{
+  size_t i;
+
+  for(i=0 ; i<len ; i++) {
+    while(!(UCA1IFG&UCTXIFG));
+    UCA1TXBUF = (unsigned char) _ptr[i];
+  }
+
+  return len;
+}
+
+static void SetVcoreUp (unsigned int level)
+{
+    /* Change VCORE voltage level */
+    PMMCTL0_H = PMMPW_H;                    // Open PMM registers for write
+    SVSMHCTL = SVSHE                        // Set SVS/SVM high side new level
+           + SVSHRVL0 * level
+           + SVMHE
+           + SVSMHRRL0 * level;
+    SVSMLCTL = SVSLE                        // Set SVM low side to new level
+           + SVMLE
+           + SVSMLRRL0 * level;
+    while ((PMMIFG & SVSMLDLYIFG) == 0);    // Wait till SVM is settled
+    PMMIFG &= ~(SVMLVLRIFG + SVMLIFG);      // Clear already set flags
+    PMMCTL0_L = PMMCOREV0 * level;          // Set VCore to new level
+    if ((PMMIFG & SVMLIFG))                 // Wait till new level reached
+    while ((PMMIFG & SVMLVLRIFG) == 0);
+    SVSMLCTL = SVSLE                        // Set SVS/SVM low side to new level
+          + SVSLRVL0 * level
+          + SVMLE
+          + SVSMLRRL0 * level;
+    PMMCTL0_H = 0x00;                       // Lock PMM registers for write access
+}
+
+int main(void)
+{
+    byte generatedAuthTag[16];
+    WOLFSSL_HEAP_HINT* HEAP_HINT = NULL;
+    int ret;
+    int start;
+
+    WDTCTL = WDTPW + WDTHOLD; /* Stop WDT */
+
+    /* NOTE: Change core voltage one level at a time.. */
+    SetVcoreUp (0x01);
+    SetVcoreUp (0x02);
+    SetVcoreUp (0x03);
+
+    /* USC module configuration, Fdcoclockdiv = Fmclk = 8MHz */
+    UCSCTL8 &= ~SMCLKREQEN;         /* disable SMCLK clock requests */
+    UCSCTL3 = (0*FLLREFDIV0)        /* FLL ref divider 1 */
+            + SELREF2;              /* set REFOCLK as FLL reference clock source */
+    UCSCTL4 = SELA__REFOCLK         /* ACLK = REFO */
+            + SELM__DCOCLKDIV       /* MCLK = DCOCLKDIV */
+            + SELS__DCOCLKDIV;      /* SMCLK = DCOCLKDIV */
+    __bis_SR_register(SCG0);        /* disable FLL operation */
+    UCSCTL0	= 0x0000;               /* lowest possible DCO, MOD */
+    UCSCTL1 = DISMOD_L              /* modulation disabled */
+            + DCORSEL_6;            /* DCO range for 8MHz operation */
+
+    UCSCTL2 = FLLD_0                /* D=FLLD=1, so that Fdco=8MHz */
+            + 243;                  /* DCO multiplier for 8MHz */
+                                    /* (N + 1) * FLLRef = Fdcodiv */
+                                    /* (243 + 1) * 32768 = 8MHz (multiplier N = 243) */
+    __bic_SR_register(SCG0);        /* re-enable FLL operation */
+
+    /* worst-case settling time for the DCO when the DCO range bits have been
+       32 x 32 x 8 MHz / 32,768 Hz = 250000 = MCLK cycles for DCO to settle
+    */
+    __delay_cycles(250000);
+
+    TA0CCR0 = 32768-1;
+    TA0CCTL0 |= CCIE;
+    TA0CTL = TASSEL_1 + ID_0 + MC_1;
+    TA2CTL = TASSEL_2 | MC_2;
+    P1DIR = 1;
+    P1OUT = 0;
+    uart_init();
+    __enable_interrupt();
+    printf("START!\r\n");
+#ifdef HAVE_ECC
+    WC_RNG rng;
+    ecc_key AliceKey, BobKey;
+
+    byte AliceSecret[ECC_256_BIT_FIELD] = {0};
+    byte BobSecret[ECC_256_BIT_FIELD] = {0};
+    word32 secretLen = 0;
+
+    if (wc_LoadStaticMemory(&HEAP_HINT, gWolfMem, sizeof(gWolfMem),
+        WOLFMEM_GENERAL, 10) != 0) {
+    	printf("unable to load static memory");
+    }
+
+    ret = wc_InitRng_ex(&rng, HEAP_HINT, INVALID_DEVID);
+    if (ret != 0) {
+        printf("RNG init fail: %d\r\n", ret);
+        return ret;
+    }
+    printf("RNG init\r\n");
+
+    ret = wc_ecc_init(&AliceKey);
+    if (ret != 0) {
+        printf("Alice init fail\r\n");
+        goto only_rng;
+    }
+    printf("Alice init\r\n");
+
+    ret = wc_ecc_init(&BobKey);
+    if (ret != 0) {
+        printf("Bob init fail\r\n");
+        goto alice_and_rng;
+    }
+    printf("Bob init\r\n");
+
+    start = seconds;
+    ret = wc_ecc_make_key(&rng, ECC_256_BIT_FIELD, &AliceKey);
+    if (ret != 0) {
+        printf("Alice keygen fail\r\n");
+        goto all_three;
+    }
+    printf("Alice keygen %d seconds\r\n", seconds - start);
+    start = seconds;
+    ret = wc_ecc_make_key(&rng, ECC_256_BIT_FIELD, &BobKey);
+    if (ret != 0) {
+        printf("Bob keygen fail\r\n");
+        goto all_three;
+    }
+    printf("Bob keygen %d seconds\r\n", seconds - start);
+    start = seconds;
+    secretLen = ECC_256_BIT_FIELD; /* explicit set */
+    ret = wc_ecc_shared_secret(&AliceKey, &BobKey, AliceSecret, &secretLen);
+    if (ret != 0) {
+        printf("Shared secret fail\r\n");
+        goto all_three;
+    }
+    printf("Bob secret %d seconds\r\n", seconds - start);
+    start = seconds;
+    secretLen = ECC_256_BIT_FIELD; /* explicit reset for best practice */
+    ret = wc_ecc_shared_secret(&BobKey, &AliceKey, BobSecret, &secretLen);
+    if (ret == 0) {
+        if (XMEMCMP(AliceSecret, BobSecret, secretLen))
+            printf("Failed to generate a common secret\n");
+    } else {
+        goto all_three;
+    }
+    printf("Alice secret %d seconds\r\n", seconds - start);
+
+    printf("Successfully generated a common secret\r\n");
+    print_secret("Alice", AliceSecret, (int) secretLen);
+    print_secret("Bob", BobSecret, (int) secretLen);
+
+all_three:
+    wc_ecc_free(&BobKey);
+alice_and_rng:
+    wc_ecc_free(&AliceKey);
+only_rng:
+    wc_FreeRng(&rng);
+
+    printf(
+        "ChaCha20/Poly1305 Encryption Start, 1000 itterations, %d bytes\r\n",
+        strlen((const char*)plaintext));
+    start = seconds;
+    for (int i=0; i <= 1000; i++) {
+        ret = wc_ChaCha20Poly1305_Encrypt(key, iv, aad, sizeof(aad), plaintext,
+                strlen((const char*)plaintext), generatedCiphertext,
+                generatedAuthTag);
+        if (ret) {
+            printf("ChaCha error: %d\r\n", ret);
+            break;
+        }
+    }
+    printf("\r\nEnd %d seconds\r\n", seconds - start);
+
+    start = seconds;
+    printf("ChaCha20/Poly1305 Decryption Start, 1000 itterations\r\n");
+    start = seconds;
+    for (int i=0; i <= 1000; i++) {
+        ret = wc_ChaCha20Poly1305_Decrypt(key, iv, aad, sizeof(aad),
+                generatedCiphertext, strlen((const char*)plaintext),
+                generatedAuthTag, generatedPlaintext);
+        if (ret) {
+            printf("ChaCha error: %d\r\n", ret);
+            break;
+        }
+    }
+    printf("\r\nEnd %d seconds\r\n", seconds - start);
+#else
+    printf("Configure wolfSSL with --enable-ecc and try again\n");
+    ret = -1;
+#endif
+    printf("end\r\n");
+    while(1) {
+        __delay_cycles(8000000);
+    }
+    return ret;
+}
+
+/* Timer ISR */
+#if defined(__TI_COMPILER_VERSION__) || defined(__IAR_SYSTEMS_ICC__)
+#pragma vector=TIMER0_A0_VECTOR
+__interrupt void TIMER0_A0_ISR(void)
+#elif defined(__GNUC__)
+void __attribute__ ((interrupt(TIMER0_A0_VECTOR))) TIMER0_A0_ISR (void)
+#else
+#error Compiler not supported!
+#endif
+{
+    seconds++;
+    P1OUT = seconds ^ 2;
+    printf(".");
+    fflush(stdout);
+}
diff --git a/IDE/IAR-MSP430/user_settings.h b/IDE/IAR-MSP430/user_settings.h
new file mode 100644
index 000000000..dea4ea1e2
--- /dev/null
+++ b/IDE/IAR-MSP430/user_settings.h
@@ -0,0 +1,134 @@
+/* user_settings.h
+ *
+ * Copyright (C) 2006-2022 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+#ifndef WOLFSSL_USER_SETTINGS_H
+#define WOLFSSL_USER_SETTINGS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef  SINGLE_THREADED
+#define SINGLE_THREADED
+
+#undef WOLFSSL_STATIC_MEMORY
+#define WOLFSSL_STATIC_MEMORY
+
+#undef WOLFSSL_NO_MALLOC
+#define WOLFSSL_NO_MALLOC
+
+#undef  NO_FILESYSTEM
+#define NO_FILESYSTEM
+
+/* WolfCrypt Only (no TLS) */
+#define WOLFCRYPT_ONLY
+
+/* 16 bit */
+#define WC_16BIT_CPU
+
+/* Endianness - defaults to little endian */
+#ifdef __BIG_ENDIAN__
+    #define BIG_ENDIAN_ORDER
+#endif
+
+/* Expose the math mp_ API's */
+#define WOLFSSL_PUBLIC_MP
+
+/* Use single precision math only */
+#define WOLFSSL_SP_MATH
+#define WOLFSSL_SP_NO_MALLOC
+#define WOLFSSL_SP_SMALL
+#define WOLFSSL_SP_NO_DYN_STACK
+#define WOLFSSL_HAVE_SP_ECC
+#define SP_WORD_SIZE 32
+#define FP_MAX_BITS (2*256)
+
+#define USE_SLOW_SHA
+#define USE_SLOW_SHA256
+#define USE_SLOW_SHA512
+
+/* Enable Timing Resistance */
+#define TFM_TIMING_RESISTANT
+#define ECC_TIMING_RESISTANT
+
+/* Enable ECC */
+#define HAVE_ECC
+#define ECC_USER_CURVES /* Only 256-Bit Curves */
+//#define ECC_SHAMIR
+
+/* Optional Feature Disables */
+#define NO_SIG_WRAPPER
+//#define NO_ECC_KEY_EXPORT
+//#define NO_ECC_DHE
+//#define NO_ECC_SIGN
+//#define NO_ECC_VERIFY
+
+/* Disable Algorithms */
+#define NO_AES
+#define NO_AES_CBC
+#define NO_DES3
+#define NO_DSA
+#define NO_RSA
+#define NO_DH
+#define NO_RC4
+#define NO_MD4
+#define NO_MD5
+#define NO_SHA
+#define NO_PWDBASED
+#define NO_PKCS12
+#define NO_PKCS8
+
+#define HAVE_CHACHA
+#define HAVE_POLY1305
+#define SIZEOF_LONG_LONG 8
+
+/* Disable Features */
+//#define NO_ASN
+//#define NO_CERTS
+//#define NO_WOLFSSL_MEMORY
+#define WOLFSSL_NO_PEM
+//#define NO_CODING
+#define NO_PSK
+#ifndef DEBUG_WOLFSSL
+    #define DEBUG_WOLFSSL
+    #define NO_ERROR_STRINGS
+#endif
+
+#define CUSTOM_RAND_TYPE      unsigned int
+extern unsigned int msp430_rnd(void);
+#undef  CUSTOM_RAND_GENERATE
+#define CUSTOM_RAND_GENERATE  msp430_rnd
+
+extern unsigned int msp430_time(long *x);
+#undef XTIME
+#define XTIME msp430_time
+
+#undef  NO_CRYPT_TEST
+#define NO_CRYPT_TEST
+
+#undef  NO_CRYPT_BENCHMARK
+#define NO_CRYPT_BENCHMARK
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WOLFSSL_USER_SETTINGS_H */

From be742cabda86b1df2f881635f2b186156d764205 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@wolfssl.com>
Date: Thu, 7 Apr 2022 15:39:32 +0100
Subject: [PATCH 2/5] Add missing include.am

---
 IDE/IAR-MSP430/include.am | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 IDE/IAR-MSP430/include.am

diff --git a/IDE/IAR-MSP430/include.am b/IDE/IAR-MSP430/include.am
new file mode 100644
index 000000000..1ff3d4794
--- /dev/null
+++ b/IDE/IAR-MSP430/include.am
@@ -0,0 +1,8 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+EXTRA_DIST+= IDE/IAR-MSP430/README.md
+EXTRA_DIST+= IDE/IAR-MSP430/main.c
+EXTRA_DIST+= IDE/IAR-MSP430/user_settings.h
+

From 676fe19e2f05fa93d746deb98f0af2d71f1eab5c Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@wolfssl.com>
Date: Fri, 8 Apr 2022 15:08:55 +0100
Subject: [PATCH 3/5] Fixes to the MSP430 example

* Fix include.am missing line
* Fix macros
* Add "static" keyword where needed
* Make compatible with MSP430 GCC
* Add MSP430 GCC Makefile
* Fix watchdog issue with GCC, also fixes IAR when large data model is
  used
* Fix comment style
* Fix typo in RNG (makes it ever so slightly more random)
* Add example output to README
---
 IDE/IAR-MSP430/Makefile   | 27 +++++++++++
 IDE/IAR-MSP430/README.md  | 63 ++++++++++++++++++++++++-
 IDE/IAR-MSP430/include.am |  2 +
 IDE/IAR-MSP430/main.c     | 97 ++++++++++++++++++++++++++-------------
 4 files changed, 156 insertions(+), 33 deletions(-)
 create mode 100644 IDE/IAR-MSP430/Makefile

diff --git a/IDE/IAR-MSP430/Makefile b/IDE/IAR-MSP430/Makefile
new file mode 100644
index 000000000..704de7451
--- /dev/null
+++ b/IDE/IAR-MSP430/Makefile
@@ -0,0 +1,27 @@
+PROGRAM = wolfcrypt
+WOLFSSL_SRC_DIR = ../..
+TI_COMPILER_PATH = /opt/ti/msp430-gcc/bin
+
+WOLFSSL_CFLAGS += -I$(WOLFSSL_SRC_DIR) -I. -DWOLFSSL_USER_SETTINGS
+
+SRC_FILES  = $(wildcard $(WOLFSSL_SRC_DIR)/src/*.c)
+SRC_FILES += $(wildcard $(WOLFSSL_SRC_DIR)/wolfcrypt/src/*.c)
+SRC_FILES := $(filter-out %bio.c %misc.c %evp.c, $(SRC_FILES))
+
+SRC = main.c \
+         $(SRC_FILES)
+
+CFLAGS += $(WOLFSSL_CFLAGS) -O3 -mmcu=msp430f5659 -I/opt/ti/msp430-gcc/include -L/opt/ti/msp430-gcc/include -mlarge -mcode-region=either -fdata-sections -ffunction-sections -Wl,--gc-sections
+
+CC = $(TI_COMPILER_PATH)/msp430-elf-gcc
+STRIP = $(TI_COMPILER_PATH)/msp430-elf-strip
+
+$(PROGRAM): $(SRC)
+	$(CC) $(CFLAGS) $(SRC) $(LDFLAGS) $(LDLIBS) -o $@
+	$(STRIP) $@
+
+clean:
+	rm -f $(PROGRAM)
+
+install:
+	mspdebug tilib "prog $(PROGRAM)" --allow-fw-update
diff --git a/IDE/IAR-MSP430/README.md b/IDE/IAR-MSP430/README.md
index 8dbef748c..ff9f53b86 100644
--- a/IDE/IAR-MSP430/README.md
+++ b/IDE/IAR-MSP430/README.md
@@ -20,8 +20,69 @@ When setting up the IDE, copy the wolfSSL source code to your project's director
 
 Use the `main.c` provided here and copy the `user_settings.h` file to the `wolfssl/wolfcrypt` subdirectory of wolfSSL.
 
-You will need to set at least 700 bytes of stack, no heap is required. It will need the memory model to set to "medium". You will also need to change the "Library Configuration" to "Full DLIB" so the `printf()` functions work correctly.
+You will need to set at least 700 bytes of stack, no heap is required. You will also need to change the "Library Configuration" to "Full DLIB" so the `printf()` functions work correctly.
 
 Make sure to add the definition `WOLFSSL_USER_SETTINGS` to the preprocessor settings in your project to that `user_settings.h` is loaded in. You will also need to add the wolfSSL root directory to the "Additional include directories".
 
 From here you can set any optimizer settings you need.
+
+## MSP430 GCC Makefile
+
+Also included is a `Makefile` for TI's GCC, when compiling with GCC the code size will be larger and the application will be ~2x slower.
+
+To use this Makefile you will need [TI's MSP430 GCC](https://www.ti.com/tool/MSP430-GCC-OPENSOURCE) installed as well as `mspdebug` with the `libmsp430.so` accessible to it. You will need to edit the `Makefile` to set the `TI_COMPILER_PATH` to where you have installed this.
+
+Once everything is in place you can run `make` to build it and `make install` to flash the MSP430 with it.
+
+**Note**: this will not work with the much older version of MSP430 GCC that comes in Linux distribution repositories.
+
+## Example Output
+
+This is an example output for the demo application when compiled with IAR.
+
+```
+START!
+Rand generated: 2317
+Rand generated: -31901
+Rand generated: 13538
+Rand generated: -24035
+Rand generated: 18849
+Rand generated: -1593
+Rand generated: 29653
+Rand generated: -8148
+Rand generated: -27438
+Rand generated: 618
+Rand generated: -17119
+Rand generated: 4668
+Rand generated: -26289
+Rand generated: 28126
+Rand generated: -15749
+Rand generated: 22041
+Rand generated: 8710
+Rand generated: -22039
+Rand generated: 1781
+Rand generated: -32168
+Rand generated: 6187
+Rand generated: -7650
+Rand generated: 30268
+Rand generated: -13585
+Rand generated: 24388
+Rand generated: 8520
+RNG init
+Alice init
+Bob init
+.............Alice keygen 13 seconds
+..............Bob keygen 14 seconds
+.............Bob secret 13 seconds
+..............Alice secret 14 seconds
+Successfully generated a common secret
+Alices' Secret: 85f3c7f599620c768e6dbb77dc2f8f764254cc1821aeb0a30503632dbc9bdb54
+Bobs' Secret: 85f3c7f599620c768e6dbb77dc2f8f764254cc1821aeb0a30503632dbc9bdb54
+ChaCha20/Poly1305 Encryption Start, 1000 itterations, 1024 bytes
+............................................
+End 44 seconds
+ChaCha20/Poly1305 Decryption Start, 1000 itterations
+............................................
+End 44 seconds
+end
+```
diff --git a/IDE/IAR-MSP430/include.am b/IDE/IAR-MSP430/include.am
index 1ff3d4794..4b6c5c052 100644
--- a/IDE/IAR-MSP430/include.am
+++ b/IDE/IAR-MSP430/include.am
@@ -2,6 +2,8 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+EXTRA_DIST+= IDE/IAR-MSP430/include.am
+EXTRA_DIST+= IDE/IAR-MSP430/Makefile
 EXTRA_DIST+= IDE/IAR-MSP430/README.md
 EXTRA_DIST+= IDE/IAR-MSP430/main.c
 EXTRA_DIST+= IDE/IAR-MSP430/user_settings.h
diff --git a/IDE/IAR-MSP430/main.c b/IDE/IAR-MSP430/main.c
index 68e2f1b4d..4375a6562 100644
--- a/IDE/IAR-MSP430/main.c
+++ b/IDE/IAR-MSP430/main.c
@@ -33,42 +33,50 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include <msp430f5359.h>
+#include <msp430f5659.h>
+
+/* Without __root on some of the functions, IAR's "Discard Unused Publics"
+   will optimze out some of the functions
+ */
+#if defined(__IAR_SYSTEMS_ICC__)
+#define IAR_KEEP __root
+#else
+#define IAR_KEEP
+#endif
 
 #define ECC_256_BIT_FIELD 32 /* 256-bit curve field */
-#define ECC_448_BIT_FIELD 56 /* 448-bit curve field */
 
-#define WOLF_GEN_MEM         (2*1024)
+#define WOLF_GEN_MEM    (2*1024)
+#define CHACHA_TEST_LEN 1024
 
 static byte gWolfMem[WOLF_GEN_MEM];
-static byte generatedCiphertext[1024];
-static byte generatedPlaintext[1024];
+static byte generatedCiphertext[CHACHA_TEST_LEN];
+static byte generatedPlaintext[CHACHA_TEST_LEN];
 
 #define MCLK_FREQ_MHZ 8 /* MCLK = 8MHz */
 
-const byte  key[] = {
+static const byte  key[] = {
     0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
     0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
     0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f
 };
 
-const byte plaintext[] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras lacus odio, pretium vel sagittis ac, facilisis quis diam. Vivamus condimentum velit sed dolor consequat interdum. Etiam eleifend ornare felis, eleifend egestas odio vulputate eu. Sed nec orci nunc. Etiam quis mi augue. Donec ullamcorper suscipit lorem, vel luctus augue cursus fermentum. Etiam a porta arcu, in convallis sem. Integer efficitur elementum diam, vel scelerisque felis posuere placerat. Donec vestibulum sit amet leo sit amet tincidunt. Etiam et vehicula turpis. Phasellus quis finibus sapien. Sed et tristique turpis. Nullam vitae sagittis tortor, et aliquet lorem. Cras a leo scelerisque, convallis lacus ut, fermentum urna. Mauris quis urna diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam aliquam vehicula orci id pulvinar. Proin mollis, libero sollicitudin tempor ultrices, massa augue tincidunt turpis, sit amet aliquam neque nibh nec dui. Fusce finibus massa quis rutrum suscipit cras amet";
+static const byte plaintext[] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras lacus odio, pretium vel sagittis ac, facilisis quis diam. Vivamus condimentum velit sed dolor consequat interdum. Etiam eleifend ornare felis, eleifend egestas odio vulputate eu. Sed nec orci nunc. Etiam quis mi augue. Donec ullamcorper suscipit lorem, vel luctus augue cursus fermentum. Etiam a porta arcu, in convallis sem. Integer efficitur elementum diam, vel scelerisque felis posuere placerat. Donec vestibulum sit amet leo sit amet tincidunt. Etiam et vehicula turpis. Phasellus quis finibus sapien. Sed et tristique turpis. Nullam vitae sagittis tortor, et aliquet lorem. Cras a leo scelerisque, convallis lacus ut, fermentum urna. Mauris quis urna diam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam aliquam vehicula orci id pulvinar. Proin mollis, libero sollicitudin tempor ultrices, massa augue tincidunt turpis, sit amet aliquam neque nibh nec dui. Fusce finibus massa quis rutrum suscipit cras amet";
 
-const byte  iv[] = {
+static const byte  iv[] = {
     0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43,
     0x44, 0x45, 0x46, 0x47
 };
 
-const byte  aad[] = { /* additional data */
+static const byte  aad[] = { /* additional data */
     0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3,
     0xc4, 0xc5, 0xc6, 0xc7
 };
 
 volatile unsigned int seconds;
 
-/* Add __root here (and a few other places) otherwise this is optimized out */
-__root unsigned int msp430_time(long *x)
+IAR_KEEP unsigned int msp430_time(long *x)
 {
     return seconds;
 }
@@ -84,9 +92,9 @@ static void print_secret(char* who, byte* s, int sLen)
 }
 
 /* This is a very crude RNG, do not use in production */
-__root unsigned int msp430_rnd(void)
+IAR_KEEP unsigned int msp430_rnd(void)
 {
-    unsigned int result = TA0R % TA2R;
+    unsigned int result = TA0R ^ TA2R;
     printf("Rand generated: %d\r\n", result);
     return result;
 }
@@ -94,8 +102,8 @@ __root unsigned int msp430_rnd(void)
 static void uart_init()
 {
     P8SEL |= BIT3 + BIT2;
-    UCA1CTLW0 = UCSWRST;                      // Put eUSCI in reset
-    UCA1CTLW0 |= UCSSEL__SMCLK;               // CLK = SMCLK
+    UCA1CTLW0 = UCSWRST;                      /* Put eUSCI in reset */
+    UCA1CTLW0 |= UCSSEL__SMCLK;               /* CLK = SMCLK */
     /* Baud Rate calculation
        This was calculated to produce 115200 for a 16MHz clock, so it produces
        57600 at 8MHz
@@ -103,14 +111,18 @@ static void uart_init()
        Fractional portion = 0.6805
        Use Table 24-5 in Family User Guide
     */
-    UCA1BR0 = 8;                               // 16000000/16/9600
+    UCA1BR0 = 8;
     UCA1BR1 = 0x00;
     UCA1MCTL |= UCOS16 | UCBRF_11 | UCBRS_0;
-    UCA1CTLW0 &= ~UCSWRST;                    // Initialize eUSCI
-    UCA1IE |= UCRXIE;                         // Enable USCI_A0 RX interrupt
+    UCA1CTLW0 &= ~UCSWRST;                    /* Initialize eUSCI */
+    UCA1IE |= UCRXIE;                         /* Enable USCI_A0 RX interrupt */
 }
 
-__root size_t __write(int fd, const unsigned char *_ptr, size_t len)
+#if defined(__IAR_SYSTEMS_ICC__)
+IAR_KEEP size_t __write(int fd, const unsigned char *_ptr, size_t len)
+#else
+int write(int fd, const char *_ptr, int len)
+#endif
 {
   size_t i;
 
@@ -125,26 +137,46 @@ __root size_t __write(int fd, const unsigned char *_ptr, size_t len)
 static void SetVcoreUp (unsigned int level)
 {
     /* Change VCORE voltage level */
-    PMMCTL0_H = PMMPW_H;                    // Open PMM registers for write
-    SVSMHCTL = SVSHE                        // Set SVS/SVM high side new level
+    PMMCTL0_H = PMMPW_H;                    /* Open PMM registers for write */
+    SVSMHCTL = SVSHE                        /* Set SVS/SVM high side new level */
            + SVSHRVL0 * level
            + SVMHE
            + SVSMHRRL0 * level;
-    SVSMLCTL = SVSLE                        // Set SVM low side to new level
+    SVSMLCTL = SVSLE                        /* Set SVM low side to new level */
            + SVMLE
            + SVSMLRRL0 * level;
-    while ((PMMIFG & SVSMLDLYIFG) == 0);    // Wait till SVM is settled
-    PMMIFG &= ~(SVMLVLRIFG + SVMLIFG);      // Clear already set flags
-    PMMCTL0_L = PMMCOREV0 * level;          // Set VCore to new level
-    if ((PMMIFG & SVMLIFG))                 // Wait till new level reached
+    while ((PMMIFG & SVSMLDLYIFG) == 0);    /* Wait till SVM is settled */
+    PMMIFG &= ~(SVMLVLRIFG + SVMLIFG);      /* Clear already set flags */
+    PMMCTL0_L = PMMCOREV0 * level;          /* Set VCore to new level */
+    if ((PMMIFG & SVMLIFG))                 /* Wait till new level reached */
     while ((PMMIFG & SVMLVLRIFG) == 0);
-    SVSMLCTL = SVSLE                        // Set SVS/SVM low side to new level
+    SVSMLCTL = SVSLE                        /* Set SVS/SVM low side to new level */
           + SVSLRVL0 * level
           + SVMLE
           + SVSMLRRL0 * level;
-    PMMCTL0_H = 0x00;                       // Lock PMM registers for write access
+    PMMCTL0_H = 0x00;                       /* Lock PMM registers for write access */
 }
 
+/* Stop WDT
+   We need to do this before main() because when there is ~4K of data to
+   initialize the watchdog will fire before initialization completes, sending
+   it into an endless loop of nothing.
+   See: https://www.iar.com/knowledge/support/technical-notes/general/my-msp430-does-not-start-up/
+*/
+#if defined(__IAR_SYSTEMS_ICC__)
+int __low_level_init()
+{
+    WDTCTL = WDTPW | WDTHOLD;
+    return 1;
+}
+#else
+static void __attribute__((naked, used, section(".crt_0042")))
+disable_watchdog (void)
+{
+    WDTCTL = WDTPW | WDTHOLD;
+}
+#endif
+
 int main(void)
 {
     byte generatedAuthTag[16];
@@ -152,8 +184,6 @@ int main(void)
     int ret;
     int start;
 
-    WDTCTL = WDTPW + WDTHOLD; /* Stop WDT */
-
     /* NOTE: Change core voltage one level at a time.. */
     SetVcoreUp (0x01);
     SetVcoreUp (0x02);
@@ -189,7 +219,11 @@ int main(void)
     P1DIR = 1;
     P1OUT = 0;
     uart_init();
+#if defined(__IAR_SYSTEMS_ICC__)
     __enable_interrupt();
+#else
+    _enable_interrupts();
+#endif
     printf("START!\r\n");
 #ifdef HAVE_ECC
     WC_RNG rng;
@@ -320,6 +354,5 @@ void __attribute__ ((interrupt(TIMER0_A0_VECTOR))) TIMER0_A0_ISR (void)
 {
     seconds++;
     P1OUT = seconds ^ 2;
-    printf(".");
-    fflush(stdout);
+    fprintf(stderr, ".");
 }

From 997feecd6ee41b6ea9f1db058d2e62d5f2b656cb Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@wolfssl.com>
Date: Fri, 8 Apr 2022 15:42:38 +0100
Subject: [PATCH 4/5] Remove unused header from MSP430 example

---
 IDE/IAR-MSP430/main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IDE/IAR-MSP430/main.c b/IDE/IAR-MSP430/main.c
index 4375a6562..e29a5ceba 100644
--- a/IDE/IAR-MSP430/main.c
+++ b/IDE/IAR-MSP430/main.c
@@ -26,7 +26,6 @@
 #include <wolfssl/wolfcrypt/random.h>
 #include <wolfssl/wolfcrypt/ecc.h>
 #include <wolfssl/wolfcrypt/curve25519.h>
-#include <wolfssl/wolfcrypt/curve448.h>
 #include <wolfssl/wolfcrypt/chacha20_poly1305.h>
 
 #include <stdio.h>

From 50bc20e340af79cf20d082ba6eae72bb3618b642 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@wolfssl.com>
Date: Fri, 8 Apr 2022 16:24:47 +0100
Subject: [PATCH 5/5] Fix include.am for MSP430

---
 IDE/IAR-MSP430/include.am | 1 -
 IDE/include.am            | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/IDE/IAR-MSP430/include.am b/IDE/IAR-MSP430/include.am
index 4b6c5c052..2c459e419 100644
--- a/IDE/IAR-MSP430/include.am
+++ b/IDE/IAR-MSP430/include.am
@@ -2,7 +2,6 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-EXTRA_DIST+= IDE/IAR-MSP430/include.am
 EXTRA_DIST+= IDE/IAR-MSP430/Makefile
 EXTRA_DIST+= IDE/IAR-MSP430/README.md
 EXTRA_DIST+= IDE/IAR-MSP430/main.c
diff --git a/IDE/include.am b/IDE/include.am
index 129a1d11c..05ee1e53b 100644
--- a/IDE/include.am
+++ b/IDE/include.am
@@ -45,6 +45,7 @@ include IDE/WINCE/include.am
 include IDE/iotsafe/include.am
 include IDE/Android/include.am
 include IDE/NETOS/include.am
+include IDE/IAR-MSP430/include.am
 
 EXTRA_DIST+= IDE/IAR-EWARM IDE/MDK-ARM IDE/MDK5-ARM IDE/MYSQL IDE/LPCXPRESSO IDE/HEXIWEAR IDE/Espressif
 EXTRA_DIST+= IDE/OPENSTM32/README.md