Update code to v1.0.14 (10)

android/extern/wolfssl/IDE/ARDUINO/README.md

@@ -0,0 +1,37 @@
+### wolfSSL with Arduino
+
+##### Reformatting wolfSSL as a compatible Arduino Library
+This is a shell script that will re-organize the wolfSSL library to be 
+compatible with Arduino projects. The Arduino IDE requires a library's source
+files to be in the library's root directory with a header file in the name of 
+the library. This script moves all src/ files to the `IDE/ARDUINO/wolfSSL`
+directory and creates a stub header file called `wolfssl.h`.
+
+Step 1: To configure wolfSSL with Arduino, enter the following from within the
+wolfssl/IDE/ARDUINO directory:
+
+        `./wolfssl-arduino.sh`
+
+Step 2: Copy the directory wolfSSL that was just created to:
+`~/Documents/Arduino/libraries/` directory so the Arduino IDE can find it.
+
+Step 3: Edit `<arduino-libraries>/wolfSSL/user_settings.h`
+If building for Intel Galileo platform add: `#define INTEL_GALILEO`.
+Add any other custom settings, for a good start see the examples in wolfssl root
+"/examples/configs/user_settings_*.h"
+
+Step 4: If you experience any issues with custom user_settings.h see the wolfssl
+porting guide here for more assistance: https://www.wolfssl.com/docs/porting-guide/
+
+Step 5: If you still have any issues contact support@wolfssl.com for more help.
+
+##### Including wolfSSL in Arduino Libraries (for Arduino version 1.6.6)
+
+1. In the Arduino IDE:
+    - In `Sketch -> Include Library -> Add .ZIP Library...` and choose the
+        `IDE/ARDUNIO/wolfSSL` folder.
+    - In `Sketch -> Include Library` choose wolfSSL.
+
+2. Open an example Arduino sketch for wolfSSL:
+	- wolfSSL Client INO sketch: `sketches/wolfssl_client/wolfssl_client.ino`
+	- wolfSSL Server INO sketch: `sketches/wolfssl_server/wolfssl_server.ino`

android/extern/wolfssl/IDE/ARDUINO/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/ARDUINO/README.md
+EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_client/wolfssl_client.ino
+EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_server/wolfssl_server.ino
+EXTRA_DIST+= IDE/ARDUINO/wolfssl-arduino.sh

android/extern/wolfssl/IDE/ARDUINO/sketches/wolfssl_client/wolfssl_client.ino

@@ -0,0 +1,159 @@
+/* wolfssl_client.ino
+ *
+ * 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
+ */
+
+
+#include <wolfssl.h>
+#include <wolfssl/ssl.h>
+#include <Ethernet.h>
+
+const char host[] = "192.168.1.148"; /* server to connect to */
+const int port = 11111; /* port on server to connect to */
+
+int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx);
+int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx);
+int reconnect = 10;
+
+EthernetClient client;
+
+WOLFSSL_CTX* ctx = NULL;
+WOLFSSL* ssl = NULL;
+
+void setup() {
+  WOLFSSL_METHOD* method;
+
+  Serial.begin(9600);
+
+  method = wolfTLSv1_2_client_method();
+  if (method == NULL) {
+    Serial.println("unable to get method");
+    return;
+  }
+  ctx = wolfSSL_CTX_new(method);
+  if (ctx == NULL) {
+    Serial.println("unable to get ctx");
+    return;
+  }
+  /* initialize wolfSSL using callback functions */
+  wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
+  wolfSSL_SetIOSend(ctx, EthernetSend);
+  wolfSSL_SetIORecv(ctx, EthernetReceive);
+  
+  return;
+}
+
+int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx) {
+  int sent = 0;
+
+  sent = client.write((byte*)msg, sz);
+
+  return sent;
+}
+
+int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx) {
+  int ret = 0;
+
+  while (client.available() > 0 && ret < sz) {
+    reply[ret++] = client.read();
+  }
+
+  return ret;
+}
+
+void loop() {
+  int err            = 0;
+  int input          = 0;
+  int total_input    = 0;
+  char msg[32]       = "hello wolfssl!";
+  int msgSz          = (int)strlen(msg);
+  char errBuf[80];
+  char reply[80];
+  const char* cipherName;
+    
+  if (reconnect) {
+    reconnect--;
+    
+    if (client.connect(host, port)) {
+
+      Serial.print("Connected to ");
+      Serial.println(host);
+
+      ssl = wolfSSL_new(ctx);
+      if (ssl == NULL) {
+        Serial.println("Unable to allocate SSL object");
+        return;
+      }
+
+      err = wolfSSL_connect(ssl);
+      if (err != WOLFSSL_SUCCESS) {
+        err = wolfSSL_get_error(ssl, 0);
+        wolfSSL_ERR_error_string(err, errBuf);
+        Serial.print("TLS Connect Error: ");
+        Serial.println(errBuf);
+      }
+
+      Serial.print("SSL version is ");
+      Serial.println(wolfSSL_get_version(ssl));
+      
+      cipherName = wolfSSL_get_cipher(ssl);
+      Serial.print("SSL cipher suite is ");
+      Serial.println(cipherName);
+
+      if ((wolfSSL_write(ssl, msg, msgSz)) == msgSz) {
+        
+        Serial.print("Server response: ");
+        /* wait for data */
+        while (!client.available()) {}
+        /* read data */
+        while (wolfSSL_pending(ssl)) {
+          input = wolfSSL_read(ssl, reply, sizeof(reply) - 1);
+          total_input += input;
+          if (input < 0) {
+            err = wolfSSL_get_error(ssl, 0);
+            wolfSSL_ERR_error_string(err, errBuf);
+            Serial.print("TLS Read Error: ");
+            Serial.println(errBuf);
+            break;
+          } else if (input > 0) {
+            reply[input] = '\0';
+            Serial.print(reply);
+          } else {
+            Serial.println();
+          }
+        } 
+      } else {
+        err = wolfSSL_get_error(ssl, 0);
+        wolfSSL_ERR_error_string(err, errBuf);
+        Serial.print("TLS Write Error: ");
+        Serial.println(errBuf);
+      }
+      
+      wolfSSL_shutdown(ssl);
+      wolfSSL_free(ssl);
+
+      client.stop();
+      Serial.println("Connection complete.");
+      reconnect = 0;
+    } else {
+      Serial.println("Trying to reconnect...");
+    }
+  }
+  delay(1000);
+}

android/extern/wolfssl/IDE/ARDUINO/sketches/wolfssl_server/wolfssl_server.ino

@@ -0,0 +1,179 @@
+/* wolfssl_server.ino
+ *
+ * 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
+ */
+
+
+#include <wolfssl.h>
+#include <wolfssl/ssl.h>
+#include <Ethernet.h>
+
+#define USE_CERT_BUFFERS_256
+#include <wolfssl/certs_test.h>
+
+#ifdef NO_WOLFSSL_SERVER
+  #error Please undefine NO_WOLFSSL_SERVER for this example
+#endif
+
+const int port = 11111; /* port to listen on */
+
+int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx);
+int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx);
+
+EthernetServer server(port);
+EthernetClient client;
+
+WOLFSSL_CTX* ctx = NULL;
+WOLFSSL* ssl = NULL;
+
+void setup() {
+  int err;
+  WOLFSSL_METHOD* method;
+
+  Serial.begin(9600);
+
+  method = wolfTLSv1_2_server_method();
+  if (method == NULL) {
+    Serial.println("unable to get method");
+    return;
+  }
+  ctx = wolfSSL_CTX_new(method);
+  if (ctx == NULL) {
+    Serial.println("unable to get ctx");
+    return;
+  }
+
+  /* initialize wolfSSL using callback functions */
+  wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
+  wolfSSL_SetIOSend(ctx, EthernetSend);
+  wolfSSL_SetIORecv(ctx, EthernetReceive);
+
+  /* setup the private key and certificate */
+  err = wolfSSL_CTX_use_PrivateKey_buffer(ctx, ecc_key_der_256, 
+    sizeof_ecc_key_der_256, WOLFSSL_FILETYPE_ASN1);
+  if (err != WOLFSSL_SUCCESS) {
+    Serial.println("error setting key");
+    return;
+  }
+  err = wolfSSL_CTX_use_certificate_buffer(ctx, serv_ecc_der_256, 
+    sizeof_serv_ecc_der_256, WOLFSSL_FILETYPE_ASN1);
+  if (err != WOLFSSL_SUCCESS) {
+    Serial.println("error setting certificate");
+    return;
+  }
+
+  /* Start the server */
+  server.begin();
+  
+  return;
+}
+
+int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx) {
+  int sent = 0;
+
+  sent = client.write((byte*)msg, sz);
+
+  return sent;
+}
+
+int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx) {
+  int ret = 0;
+
+  while (client.available() > 0 && ret < sz) {
+    reply[ret++] = client.read();
+  }
+
+  return ret;
+}
+
+void loop() {
+  int err = 0;
+  int input = 0;
+  char errBuf[80];
+  char reply[80];
+  int replySz = 0;
+  const char* cipherName;
+
+  /* Listen for incoming client requests. */
+  client = server.available();
+  if (!client) {
+    return;
+  }
+
+  if (client.connected()) {
+
+    Serial.println("Client connected");
+
+    ssl = wolfSSL_new(ctx);
+    if (ssl == NULL) {
+      Serial.println("Unable to allocate SSL object");
+      return;
+    }
+
+    err = wolfSSL_accept(ssl);
+    if (err != WOLFSSL_SUCCESS) {
+      err = wolfSSL_get_error(ssl, 0);
+      wolfSSL_ERR_error_string(err, errBuf);
+      Serial.print("TLS Accept Error: ");
+      Serial.println(errBuf);
+    }
+
+    Serial.print("SSL version is ");
+    Serial.println(wolfSSL_get_version(ssl));
+    
+    cipherName = wolfSSL_get_cipher(ssl);
+    Serial.print("SSL cipher suite is ");
+    Serial.println(cipherName);
+
+    Serial.print("Server Read: ");
+    /* wait for data */
+    while (!client.available()) {}
+    /* read data */
+    while (wolfSSL_pending(ssl)) {
+      input = wolfSSL_read(ssl, reply, sizeof(reply) - 1);
+      if (input < 0) {
+        err = wolfSSL_get_error(ssl, 0);
+        wolfSSL_ERR_error_string(err, errBuf);
+        Serial.print("TLS Read Error: ");
+        Serial.println(errBuf);
+        break;
+      } else if (input > 0) {
+        replySz = input;
+        reply[input] = '\0';
+        Serial.print(reply);
+      } else {
+        Serial.println();
+      }
+    }
+
+    /* echo data */
+    if ((wolfSSL_write(ssl, reply, replySz)) != replySz) {
+      err = wolfSSL_get_error(ssl, 0);
+      wolfSSL_ERR_error_string(err, errBuf);
+      Serial.print("TLS Write Error: ");
+      Serial.println(errBuf);
+    }
+    
+    wolfSSL_shutdown(ssl);
+    wolfSSL_free(ssl);
+  }
+
+  client.stop();
+  Serial.println("Connection complete");
+}

android/extern/wolfssl/IDE/ARDUINO/wolfssl-arduino.sh

@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# this script will reformat the wolfSSL source code to be compatible with
+# an Arduino project
+# run as bash ./wolfssl-arduino.sh
+
+DIR=${PWD##*/}
+
+space(){
+    echo "" >> "$1"
+}
+
+if [ "$DIR" = "ARDUINO" ]; then
+	if [ ! -d "wolfSSL" ]; then
+	    mkdir wolfSSL
+    fi
+
+    cp ../../src/*.c ./wolfSSL
+    cp ../../wolfcrypt/src/*.c ./wolfSSL
+
+    if [ ! -d "wolfSSL/wolfssl" ]; then
+	    mkdir wolfSSL/wolfssl
+    fi
+    cp ../../wolfssl/*.h ./wolfSSL/wolfssl
+    if [ ! -d "wolfSSL/wolfssl/wolfcrypt" ]; then
+        mkdir wolfSSL/wolfssl/wolfcrypt
+    fi
+    cp ../../wolfssl/wolfcrypt/*.h ./wolfSSL/wolfssl/wolfcrypt
+
+    # support misc.c as include in wolfcrypt/src
+    if [ ! -d "./wolfSSL/wolfcrypt" ]; then
+        mkdir ./wolfSSL/wolfcrypt
+    fi
+    if [ ! -d "./wolfSSL/wolfcrypt/src" ]; then
+        mkdir ./wolfSSL/wolfcrypt/src
+    fi
+    cp ../../wolfcrypt/src/misc.c ./wolfSSL/wolfcrypt/src
+    cp ../../wolfcrypt/src/asm.c  ./wolfSSL/wolfcrypt/src
+
+    # put bio and evp as includes
+    mv ./wolfSSL/bio.c ./wolfSSL/wolfssl
+	mv ./wolfSSL/evp.c ./wolfSSL/wolfssl
+
+    # make a copy of evp.c and bio.c for ssl.c to include inline
+    cp ./wolfSSL/wolfssl/evp.c ./wolfSSL/wolfcrypt/src/evp.c
+    cp ./wolfSSL/wolfssl/bio.c ./wolfSSL/wolfcrypt/src/bio.c
+    
+    # copy openssl compatibility headers to their appropriate location
+    if [ ! -d "./wolfSSL/wolfssl/openssl" ]; then
+        mkdir ./wolfSSL/wolfssl/openssl
+    fi
+    cp ../../wolfssl/openssl/* ./wolfSSL/wolfssl/openssl
+
+    echo "/* Generated wolfSSL header file for Arduino */" > ./wolfSSL/wolfssl.h
+    echo "#include <user_settings.h>" >> ./wolfSSL/wolfssl.h
+    echo "#include <wolfssl/wolfcrypt/settings.h>" >> ./wolfSSL/wolfssl.h
+    echo "#include <wolfssl/ssl.h>" >> ./wolfSSL/wolfssl.h
+
+    if [ ! -f "./wolfSSL/user_settings.h" ]; then
+        echo "/* Generated wolfSSL user_settings.h file for Arduino */" > ./wolfSSL/user_settings.h
+        echo "#ifndef ARDUINO_USER_SETTINGS_H" >> ./wolfSSL/user_settings.h
+        echo "#define ARDUINO_USER_SETTINGS_H" >> ./wolfSSL/user_settings.h
+        space ./wolfSSL/user_settings.h
+        echo "/* Platform */" >> ./wolfSSL/user_settings.h
+        echo "#define WOLFSSL_ARDUINO" >> ./wolfSSL/user_settings.h
+        space ./wolfSSL/user_settings.h
+        echo "/* Math library (remove this to use normal math)*/" >>  ./wolfSSL/user_settings.h
+        echo "#define USE_FAST_MATH" >> ./wolfSSL/user_settings.h
+        echo "#define TFM_NO_ASM" >> ./wolfSSL/user_settings.h
+        space ./wolfSSL/user_settings.h
+        echo "/* RNG DEFAULT !!FOR TESTING ONLY!! */" >>  ./wolfSSL/user_settings.h
+        echo "/* comment out the error below to get started w/ bad entropy source" >>  ./wolfSSL/user_settings.h
+        echo " * This will need fixed before distribution but is OK to test with */" >>  ./wolfSSL/user_settings.h
+        echo "#error \"needs solved, see: https://www.wolfssl.com/docs/porting-guide/\"" >>  ./wolfSSL/user_settings.h
+        echo "#define WOLFSSL_GENSEED_FORTEST" >> ./wolfSSL/user_settings.h
+        space ./wolfSSL/user_settings.h
+        echo "#endif /* ARDUINO_USER_SETTINGS_H */" >> ./wolfSSL/user_settings.h
+    fi
+
+    cp wolfSSL/wolfssl/wolfcrypt/settings.h wolfSSL/wolfssl/wolfcrypt/settings.h.bak
+    echo " /* wolfSSL Generated ARDUINO settings */" > ./wolfSSL/wolfssl/wolfcrypt/settings.h
+    echo "#ifndef WOLFSSL_USER_SETTINGS" >> ./wolfSSL/wolfssl/wolfcrypt/settings.h
+    echo "    #define WOLFSSL_USER_SETTINGS" >> ./wolfSSL/wolfssl/wolfcrypt/settings.h
+    echo "#endif /* WOLFSSL_USER_SETTINGS */" >> ./wolfSSL/wolfssl/wolfcrypt/settings.h
+    echo " /* wolfSSL Generated ARDUINO settings: END */" >> ./wolfSSL/wolfssl/wolfcrypt/settings.h
+    cat ./wolfSSL/wolfssl/wolfcrypt/settings.h.bak >> ./wolfSSL/wolfssl/wolfcrypt/settings.h
+
+else
+    echo "ERROR: You must be in the IDE/ARDUINO directory to run this script"
+fi