Check-in FIPS 140-3 PILOT changes

Add AES-OFB to FIPS boundary

.github/workflows/macos-check.yml

@@ -0,0 +1,28 @@
+name: macOS Build Test
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: brew
+      run: brew install automake libtool
+    - name: autogen
+      run: ./autogen.sh
+    - name: configure
+      run: ./configure
+    - name: make
+      run: make
+    - name: make check
+      run: make check
+    - name: make distcheck
+      run: make distcheck
+

.github/workflows/ubuntu-check.yml

@@ -0,0 +1,26 @@
+name: Ubuntu Build Test
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: autogen
+      run: ./autogen.sh
+    - name: configure
+      run: ./configure
+    - name: make
+      run: make
+    - name: make check
+      run: make check
+    - name: make distcheck
+      run: make distcheck
+

.github/workflows/windows-check.yml

@@ -0,0 +1,38 @@
+name: Windows Build Test
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+
+env:
+  # Path to the solution file relative to the root of the project.
+  SOLUTION_FILE_PATH: wolfssl64.sln
+
+  # Configuration type to build.
+  # You can convert this to a build matrix if you need coverage of multiple configuration types.
+  # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+  BUILD_CONFIGURATION: Release
+  BUILD_PLATFORM: x64
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v1
+
+    - name: Restore NuGet packages
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: nuget restore ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Build
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: msbuild /m /p:PlatformToolset=v142 /p:Platform=${{env.BUILD_PLATFORM}} /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
+

.gitignore

@@ -27,6 +27,7 @@ rpm/spec
 stamp-h
 cyassl/options.h
 wolfssl/options.h
+.build_params
 libtool.m4
 aclocal.m4
 aminclude.am
@@ -230,6 +231,7 @@ IDE/MDK-ARM/LPC43xx/LPC43xx/
 *.gcno
 *.gcda
 *.gcov
+*.dgcov
 !linuxkm/Makefile
 /Kbuild
 linuxkm/*.ko
@@ -239,6 +241,7 @@ linuxkm/modules.order
 linuxkm/wolfcrypt
 linuxkm/libwolfssl.mod
 linuxkm/libwolfssl.mod.c
+linuxkm/libwolfssl.lds
 linuxkm/module_exports.c
 linuxkm/linuxkm/get_thread_size
 
@@ -326,6 +329,10 @@ IDE/HEXIWEAR/wolfSSL_HW/Debug
 # Linux-SGX
 IDE/LINUX-SGX/*.a
 
+IDE/iotsafe/*.map
+IDE/iotsafe/*.elf
+IDE/iotsafe/*.bin
+
 # Binaries
 wolfcrypt/src/port/intel/qat_test
 /mplabx/wolfssl.X/dist/default/
@@ -355,6 +362,12 @@ IDE/XCODE/Index
 /IDE/Renesas/e2studio/Projects/test/*.launch
 /IDE/Renesas/e2studio/Projects/test/*.scfg
 
+# QNX CAAM
+/IDE/QNX/example-server/server-tls
+/IDE/QNX/example-client/client-tls
+/IDE/QNX/example-cmac/cmac-test
+/IDE/QNX/CAAM-DRIVER/wolfCrypt
+
 # Emacs
 *~
 
@@ -362,3 +375,7 @@ IDE/XCODE/Index
 CMakeFiles/
 CMakeCache.txt
 cmake_install.cmake
+
+# GDB Settings
+\.gdbinit
+

CMakeLists.txt

@@ -28,7 +28,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
      You must delete them, or cmake will refuse to work.")
 endif()
 
-project(wolfssl VERSION 4.7.0 LANGUAGES C)
+project(wolfssl VERSION 5.0.1 LANGUAGES C)
 
 # shared library versioning
 # increment if interfaces have been added, removed or changed
@@ -180,9 +180,21 @@ find_package(Threads)
 #       - 32-bit mode
 #       - 16-bit mode
 
+# For reproducible build, gate out from the build anything that might
+# introduce semantically frivolous jitter, maximizing chance of
+# identical object files.
+set(WOLFSSL_REPRODUCIBLE_BUILD_HELP_STRING "Enable maximally reproducible build (default: disabled)")
+add_option("WOLFSSL_REPRODUCIBLE_BUILD" ${WOLFSSL_REPRODUCIBLE_BUILD_HELP_STRING} "no" "yes;no")
+
+if(WOLFSSL_REPRODUCIBLE_BUILD)
+    set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Dqc <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> Dq  <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -D <TARGET>")
+endif()
+
 # Support for disabling all ASM
 set(WOLFSSL_ASM_HELP_STRING "Enables option for assembly (default: enabled)")
-option(WOLFSSL_ASM ${WOLFSSL_ASM_HELP_STRING} "yes")
+add_option("WOLFSSL_ASM" ${WOLFSSL_ASM_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_ASM)
     list(APPEND WOLFSSL_DEFINITIONS
@@ -192,7 +204,7 @@ endif()
 
 # Single threaded
 set(WOLFSSL_SINGLE_THREADED_HELP_STRING "Enable wolfSSL single threaded (default: disabled)")
-option(WOLFSSL_SINGLE_THREADED ${WOLFSSL_SINGLE_THREADED_HELP_STRING} "no")
+add_option("WOLFSSL_SINGLE_THREADED" ${WOLFSSL_SINGLE_THREADED_HELP_STRING} "no" "yes;no")
 
 # TODO: Logic here isn't complete, yet (see AX_PTHREAD)
 if(NOT WOLFSSL_SINGLE_THREADED)
@@ -209,7 +221,7 @@ endif()
 
 # TLS v1.3
 set(WOLFSSL_TLS13_HELP_STRING "Enable wolfSSL TLS v1.3 (default: enabled)")
-option(WOLFSSL_TLS13 ${WOLFSSL_TLS13_HELP_STRING} "yes")
+add_option("WOLFSSL_TLS13" ${WOLFSSL_TLS13_HELP_STRING} "yes" "yes;no")
 
 if("${FIPS_VERSION}" STREQUAL "v1")
     override_cache(WOLFSSL_TLS13 "no")
@@ -220,7 +232,7 @@ endif()
 
 # RNG
 set(WOLFSSL_RNG_HELP_STRING "Enable compiling and using RNG (default: enabled)")
-option(WOLFSSL_RNG ${WOLFSSL_RNG_HELP_STRING} "yes")
+add_option("WOLFSSL_RNG" ${WOLFSSL_RNG_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_RNG)
     list(APPEND WOLFSSL_DEFINITIONS "-DWC_NO_RNG")
@@ -247,7 +259,7 @@ endif()
 
 # Harden, enable Timing Resistance and Blinding by default
 set(WOLFSSL_HARDEN_HELP_STRING "Enable Hardened build, Enables Timing Resistance and Blinding (default: enabled)")
-option(WOLFSSL_HARDEN ${WOLFSSL_HARDEN_HELP_STRING} "yes")
+add_option("WOLFSSL_HARDEN" ${WOLFSSL_HARDEN_HELP_STRING} "yes" "yes;no")
 
 if(WOLFSSL_HARDEN)
     list(APPEND WOLFSSL_DEFINITIONS "-DTFM_TIMING_RESISTANT" "-DECC_TIMING_RESISTANT")
@@ -259,6 +271,19 @@ else()
     list(APPEND WOLFSSL_DEFINITIONS "-DWC_NO_HARDEN")
 endif()
 
+set(WOLFSSL_OPENSSLEXTRA_HELP_STRING "Enable extra OpenSSL API, size+ (default: disabled)")
+add_option(WOLFSSL_OPENSSLEXTRA ${WOLFSSL_OPENSSLEXTRA_HELP_STRING} "no" "yes;no")
+
+if (WOLFSSL_OPENSSLEXTRA AND NOT WOLFSSL_OPENSSLCOEXIST)
+    list(APPEND WOLFSSL_DEFINITIONS
+      "-DOPENSSL_EXTRA"
+      "-DWOLFSSL_ALWAYS_VERIFY_CB"
+      "-DWOLFSSL_VERIFY_CB_ALL_CERTS"
+      "-DWOLFSSL_EXTRA_ALERTS"
+      "-DHAVE_EXT_CACHE"
+      "-DWOLFSSL_FORCE_CACHE_ON_TICKET")
+endif()
+
 # TODO: - IPv6 test apps
 
 set(WOLFSSL_SLOW_MATH "yes")
@@ -279,7 +304,7 @@ set(WOLFSSL_SLOW_MATH "yes")
 
 # AES-CBC
 set(WOLFSSL_AESCBC_HELP_STRING "Enable wolfSSL AES-CBC support (default: enabled)")
-option(WOLFSSL_AESCBC ${WOLFSSL_AESCBC_HELP_STRING} "yes")
+add_option("WOLFSSL_AESCBC" ${WOLFSSL_AESCBC_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_AESCBC)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_AES_CBC")
@@ -287,8 +312,7 @@ endif()
 
 # AES-GCM
 set(WOLFSSL_AESGCM_HELP_STRING "Enable wolfSSL AES-GCM support (default: enabled)")
-set(WOLFSSL_AESGCM "yes" CACHE STRING ${WOLFSSL_AESGCM_HELP_STRING})
-set_property(CACHE WOLFSSL_AESGCM PROPERTY STRINGS "yes" "no" "table" "small" "word32")
+add_option("WOLFSSL_AESGCM" ${WOLFSSL_AESGCM_HELP_STRING} "yes" "yes;no;table;small;word32")
 
 # leanpsk and leantls don't need gcm
 if(WOLFSSL_LEAN_PSK OR (WOLFSSL_LEAN_TLS AND NOT WOLFSSL_TLS13))
@@ -331,9 +355,37 @@ endif()
 #       - RIPEMD
 #       - BLAKE2
 
+
+# SHA224
+set(SHA224_DEFAULT "no")
+if(("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") OR
+    ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
+    if(NOT WOLFSSL_AFALG AND NOT WOLFSSL_DEVCRYPTO AND
+       (NOT WOLFSSL_FIPS OR ("${FIPS_VERSION}" STREQUAL "v2")))
+        set(SHA224_DEFAULT "yes")
+    endif()
+endif()
+set(WOLFSSL_SHA224_HELP_STRING "Enable wolfSSL SHA-224 support (default: enabled on x86_64/aarch64)")
+add_option("WOLFSSL_SHA224" ${WOLFSSL_SHA224_HELP_STRING} ${SHA224_DEFAULT} "yes;no")
+
+# SHA3
+set(SHA3_DEFAULT "no")
+if(("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") OR
+    ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
+    if(NOT WOLFSSL_FIPS OR ("${FIPS_VERSION}" STREQUAL "v2"))
+        set(SHA3_DEFAULT "yes")
+    endif()
+endif()
+set(WOLFSSL_SHA3_HELP_STRING "Enable wolfSSL SHA-3 support (default: enabled on x86_64/aarch64)")
+add_option("WOLFSSL_SHA3" ${WOLFSSL_SHA3_HELP_STRING} ${SHA3_DEFAULT} "yes;no;small")
+
+# SHAKE256
+set(WOLFSSL_SHAKE256_HELP_STRING "Enable wolfSSL SHAKE256 support (default: enabled on x86_64/aarch64)")
+add_option("WOLFSSL_SHAKE256" ${WOLFSSL_SHAKE256_HELP_STRING} "no" "yes;no;small")
+
 # SHA512
 set(WOLFSSL_SHA512_HELP_STRING "Enable wolfSSL SHA-512 support (default: enabled)")
-option(WOLFSSL_SHA512 ${WOLFSSL_SHA512_HELP_STRING} "yes")
+add_option("WOLFSSL_SHA512" ${WOLFSSL_SHA512_HELP_STRING} "yes" "yes;no")
 
 # options that don't require sha512
 if(WOLFSSL_LEAN_PSK OR
@@ -356,7 +408,7 @@ endif()
 
 # SHA384
 set(WOLFSSL_SHA384_HELP_STRING "Enable wolfSSL SHA-384 support (default: enabled)")
-option(WOLFSSL_SHA384 ${WOLFSSL_SHA384_HELP_STRING} "yes")
+add_option("WOLFSSL_SHA384" ${WOLFSSL_SHA384_HELP_STRING} "yes" "yes;no")
 
 # options that don't require sha384
 if(WOLFSSL_LEAN_PSK OR
@@ -387,7 +439,7 @@ endif()
 
 # HKDF
 set(WOLFSSL_HKDF_HELP_STRING "Enable HKDF (HMAC-KDF) support (default: disabled)")
-option(WOLFSSL_HKDF ${WOLFSSL_HKDF_HELP_STRING} "no")
+add_option("WOLFSSL_HKDF" ${WOLFSSL_HKDF_HELP_STRING} "no" "yes;no")
 
 if(WOLFSSL_TLS13)
     override_cache(WOLFSSL_HKDF "yes")
@@ -401,7 +453,7 @@ endif()
 
 # DSA
 set(WOLFSSL_DSA_HELP_STRING "Enable DSA (default: disabled)")
-option(WOLFSSL_DSA ${WOLFSSL_DSA_HELP_STRING} "no")
+add_option("WOLFSSL_DSA" ${WOLFSSL_DSA_HELP_STRING} "no" "yes;no")
 
 if(NOT WOLFSSL_DSA AND NOT WOLFSSL_OPENSSH)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_DSA")
@@ -409,12 +461,11 @@ endif()
 
 # ECC Shamir
 set(WOLFSSL_ECCSHAMIR_HELP_STRING "Enable ECC Shamir (default: enabled)")
-option(WOLFSSL_ECCSHAMIR ${WOLFSSL_ECCSHAMIR_HELP_STRING} "yes")
+add_option("WOLFSSL_ECCSHAMIR" ${WOLFSSL_ECCSHAMIR_HELP_STRING} "yes" "yes;no")
 
 # ECC
 set(WOLFSSL_ECC_HELP_STRING "Enable ECC (default: enabled)")
-set(WOLFSSL_ECC "yes" CACHE STRING ${WOLFSSL_ECC_HELP_STRING})
-set_property(CACHE WOLFSSL_ECC PROPERTY STRINGS "yes" "no" "nonblock")
+add_option("WOLFSSL_ECC" ${WOLFSSL_ECC_HELP_STRING} "yes" "yes;no;nonblock")
 
 # lean psk doesn't need ecc
 if(WOLFSSL_LEAN_PSK)
@@ -441,18 +492,105 @@ endif()
 
 # TODO: - ECC custom curves
 #       - Compressed key
-#       - CURVE25519
-#       - ED25519
-#       - CURVE448
-#       - ED448
 #       - FP ECC, fixed point cache ECC
 #       - ECC encrypt
 #       - PSK
 #       - Single PSK identity
 
+# CURVE25519
+set(WOLFSSL_CURVE25519_SMALL "no")
+set(WOLFSSL_CURVE25519_HELP_STRING "Enable Curve25519 (default: disabled)")
+add_option("WOLFSSL_CURVE25519" ${WOLFSSL_CURVE25519_HELP_STRING} "no" "yes;no;small;no128bit")
+
+if(WOLFSSL_OPENSSH)
+    override_cache(WOLFSSL_CURVE25519 "yes")
+endif()
+
+if(WOLFSSL_CURVE25519)
+    if("${WOLFSSL_CURVE25519}" STREQUAL "small" OR WOLFSSL_LOW_RESOURCE)
+        list(APPEND WOLFSSL_DEFINITIONS "-DCURVE25519_SMALL")
+        set(WOLFSSL_CURVE25519_SMALL "yes")
+    endif()
+
+    if("${WOLFSSL_CURVE25519}" STREQUAL "no128bit" OR WOLFSSL_32BIT)
+        list(APPEND WOLFSSL_DEFINITIONS "-DNO_CURVED25519_128BIT")
+    endif()
+
+    list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_CURVE25519")
+    set(WOLFSSL_FEMATH "yes")
+endif()
+
+# ED25519
+set(WOLFSSL_ED25519_SMALL "no")
+set(WOLFSSL_ED25519_HELP_STRING "Enable ED25519 (default: disabled)")
+add_option("WOLFSSL_ED25519" ${WOLFSSL_ED25519_HELP_STRING} "no" "yes;no")
+
+if(WOLFSSL_OPENSSH)
+    override_cache(WOLFSSL_ED25519 "yes")
+endif()
+
+if(WOLFSSL_ED25519 AND NOT WOLFSSL_32BIT)
+    if("${WOLFSSL_ED25519}" STREQUAL "small" OR WOLFSSL_LOW_RESOURCE)
+        list(APPEND WOLFSSL_DEFINITIONS "-DED25519_SMALL")
+        set(WOLFSSL_ED25519_SMALL "yes")
+        set(WOLFSSL_CURVE25519_SMALL "yes")
+    endif()
+
+    if(NOT WOLFSSL_SHA512)
+        message(FATAL_ERROR "cannot enable ed25519 without enabling sha512.")
+    endif()
+
+    set(WOLFSSL_FEMATH "yes")
+    set(WOLFSSL_GEMATH "yes")
+    list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_ED25519")
+endif()
+
+# CURVE448
+set(WOLFSSL_CURVE448_SMALL "no")
+set(WOLFSSL_CURVE448_HELP_STRING "Enable Curve448 (default: disabled)")
+add_option("WOLFSSL_CURVE448" ${WOLFSSL_CURVE448_HELP_STRING} "no" "yes;no;small")
+
+if(WOLFSSL_CURVE448)
+    if("${WOLFSSL_CURVE448}" STREQUAL "small" OR WOLFSSL_LOW_RESOURCE)
+        list(APPEND WOLFSSL_DEFINITIONS "-DCURVE448_SMALL")
+        set(WOLFSSL_CURVE448_SMALL "yes")
+    endif()
+
+    if("${WOLFSSL_CURVE448}" STREQUAL "no128bit" OR WOLFSSL_32BIT)
+        list(APPEND WOLFSSL_DEFINITIONS "-DNO_CURVED448_128BIT")
+    endif()
+
+    list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_CURVE448")
+    set(WOLFSSL_FE448 "yes")
+endif()
+
+# ED448
+set(WOLFSSL_ED448_SMALL "no")
+set(WOLFSSL_ED448_HELP_STRING "Enable ED448 (default: disabled)")
+add_option("WOLFSSL_ED448" ${WOLFSSL_ED448_HELP_STRING} "no" "yes;no;small")
+
+if(WOLFSSL_ED448 AND NOT WOLFSSL_32BIT)
+    if("${WOLFSSL_ED448}" STREQUAL "small" OR WOLFSSL_LOW_RESOURCE)
+        list(APPEND WOLFSSL_DEFINITIONS "-DED448_SMALL")
+        set(WOLFSSL_ED448_SMALL "yes")
+        set(WOLFSSL_CURVE448_SMALL "yes")
+    endif()
+
+    if(NOT WOLFSSL_SHA512)
+        message(FATAL_ERROR "cannot enable ed448 without enabling sha512.")
+    endif()
+
+    set(WOLFSSL_FE448 "yes")
+    set(WOLFSSL_GE448 "yes")
+    list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_ED448")
+
+    # EdDSA448 requires SHAKE256 which requires SHA-3
+    override_cache(WOLFSSL_SHAKE256 "yes")
+endif()
+
 # Error strings
 set(WOLFSSL_ERROR_STRINGS_HELP_STRING "Enable error strings table (default: enabled)")
-option(WOLFSSL_ERROR_STRINGS ${WOLFSSL_ERROR_STRINGS_HELP_STRING} "yes")
+add_option("WOLFSSL_ERROR_STRINGS" ${WOLFSSL_ERROR_STRINGS_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_ERROR_STRINGS)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_ERROR_STRINGS")
@@ -466,7 +604,7 @@ endif()
 
 # Error queue
 set(WOLFSSL_ERROR_QUEUE_HELP_STRING "Enables adding nodes to error queue when compiled with OPENSSL_EXTRA (default: enabled)")
-option(WOLFSSL_ERROR_QUEUE ${WOLFSSL_DISABLE_ERROR_QUEUE_HELP_STRING} "yes")
+add_option("WOLFSSL_ERROR_QUEUE" ${WOLFSSL_ERROR_QUEUE_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_ERROR_QUEUE)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_ERROR_QUEUE")
@@ -474,7 +612,7 @@ endif()
 
 # Old TLS
 set(WOLFSSL_OLD_TLS_HELP_STRING "Enable old TLS versions < 1.2 (default: enabled)")
-option(WOLFSSL_OLD_TLS ${WOLFSSL_OLD_TLS_HELP_STRING} "yes")
+add_option("WOLFSSL_OLD_TLS" ${WOLFSSL_OLD_TLS_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_OLD_TLS)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_OLD_TLS")
@@ -488,7 +626,7 @@ endif()
 
 # TLSv1.2
 set(WOLFSSL_TLSV12_HELP_STRING "Enable TLS versions 1.2 (default: enabled)")
-option(WOLFSSL_TLSV12 ${WOLFSSL_TLSV12_HELP_STRING} "yes")
+add_option("WOLFSSL_TLSV12" ${WOLFSSL_TLSV12_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_TLSV12)
     list(APPEND WOLFSSL_DEFINITIONS
@@ -503,7 +641,7 @@ endif()
 
 # Memory
 set(WOLFSSL_MEMORY_HELP_STRING "Enable memory callbacks (default: enabled)")
-option(WOLFSSL_MEMORY ${WOLFSSL_MEMORY_HELP_STRING} "yes")
+add_option("WOLFSSL_MEMORY" ${WOLFSSL_MEMORY_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_MEMORY)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_WOLFSSL_MEMORY")
@@ -521,7 +659,7 @@ endif()
 
 # RSA
 set(WOLFSSL_RSA_HELP_STRING "Enable RSA (default: enabled)")
-option(WOLFSSL_RSA ${WOLFSSL_RSA_HELP_STRING} "yes")
+add_option("WOLFSSL_RSA" ${WOLFSSL_RSA_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_RSA)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_RSA")
@@ -534,7 +672,7 @@ endif()
 
 # OAEP
 set(WOLFSSL_OAEP_HELP_STRING "Enable RSA OAEP (default: enabled)")
-option(WOLFSSL_OAEP ${WOLFSSL_OAEP_HELP_STRING} "yes")
+add_option("WOLFSSL_OAEP" ${WOLFSSL_OAEP_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_OAEP)
     list(APPEND WOLFSSL_DEFINITIONS "-DWC_NO_RSA_OAEP")
@@ -545,7 +683,7 @@ endif()
 
 # RSA-PSS
 set(WOLFSSL_RSA_PSS_HELP_STRING "Enable RSA-PSS (default: disabled)")
-option(WOLFSSL_RSA_PSS ${WOLFSSL_RSA_PSS_HELP_STRING} "no")
+add_option("WOLFSSL_RSA_PSS" ${WOLFSSL_RSA_PSS_HELP_STRING} "no" "yes;no")
 
 if(NOT WOLFSSL_RSA)
     override_cache(WOLFSSL_RSA_PSS "no")
@@ -560,7 +698,7 @@ endif()
 
 # DH
 set(WOLFSSL_DH_HELP_STRING "Enable DH (default: enabled)")
-option(WOLFSSL_DH ${WOLFSSL_DH_HELP_STRING} "yes")
+add_option("WOLFSSL_DH" ${WOLFSSL_DH_HELP_STRING} "yes" "yes;no")
 
 if(WOLFSSL_OPENSSH)
     override_cache(WOLFSSL_DH "yes")
@@ -581,7 +719,7 @@ endif()
 # turn off asn, which means no certs, no rsa, no dsa, no ecc,
 # and no big int (unless dh is on)
 set(WOLFSSL_ASN_HELP_STRING "Enable ASN (default: enabled)")
-option(WOLFSSL_ASN ${WOLFSSL_ASN_HELP_STRING} "yes")
+add_option("WOLFSSL_ASN" ${WOLFSSL_ASN_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_ASN)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_ASN" "-DNO_CERTS")
@@ -626,7 +764,7 @@ endif()
 
 # AES
 set(WOLFSSL_AES_HELP_STRING "Enable AES (default: enabled)")
-option(WOLFSSL_AES ${WOLFSSL_AES_HELP_STRING} "yes")
+add_option("WOLFSSL_AES" ${WOLFSSL_AES_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_AES)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_AES")
@@ -655,7 +793,7 @@ endif()
 
 # Coding
 set(WOLFSSL_CODING_HELP_STRING "Enable coding base 16/64 (default: enabled)")
-option(WOLFSSL_CODING ${WOLFSSL_CODING_HELP_STRING} "yes")
+add_option("WOLFSSL_CODING" ${WOLFSSL_CODING_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_CODING)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_CODING")
@@ -674,7 +812,7 @@ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
 endif()
 
 set(WOLFSSL_BASE64_ENCODE_HELP_STRING "Enable Base64 encoding (default: enabled on x86_64)")
-option(WOLFSSL_BASE64_ENCODE ${WOLFSSL_BASE64_ENCODE_HELP_STRING} ${BASE64_ENCODE_DEFAULT})
+add_option("WOLFSSL_BASE64_ENCODE" ${WOLFSSL_BASE64_ENCODE_HELP_STRING} ${BASE64_ENCODE_DEFAULT} "yes;no")
 
 if(WOLFSSL_BASE64_ENCODE)
     list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_BASE64_ENCODE")  
@@ -684,7 +822,7 @@ endif()
 
 # DES3
 set(WOLFSSL_DES3_HELP_STRING "Enable DES3 (default: disabled)")
-option(WOLFSSL_DES3 ${WOLFSSL_DES3_HELP_STRING} "no")
+add_option("WOLFSSL_DES3" ${WOLFSSL_DES3_HELP_STRING} "no" "yes;no")
 
 if(WOLFSSL_OPENSSH OR
    WOLFSSL_QT OR
@@ -697,7 +835,7 @@ endif()
 
 # ARC4
 set(WOLFSSL_ARC4_HELP_STRING "Enable ARC4 (default: disabled)")
-option(WOLFSSL_ARC4 ${WOLFSSL_ARC4_HELP_STRING} "no")
+add_option("WOLFSSL_ARC4" ${WOLFSSL_ARC4_HELP_STRING} "no" "yes;no")
 
 if(WOLFSSL_OPENSSH OR WOLFSSL_WPAS)
     override_cache(WOLFSSL_ARC4 "yes")
@@ -715,7 +853,7 @@ endif()
 
 # MD5
 set(WOLFSSL_MD5_HELP_STRING "Enable MD5 (default: enabled)")
-option(WOLFSSL_MD5 ${WOLFSSL_MD5_HELP_STRING} "yes")
+add_option("WOLFSSL_MD5" ${WOLFSSL_MD5_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_MD5)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_MD5" "-DNO_OLD_TLS")
@@ -729,7 +867,7 @@ endif()
 
 # SHA
 set(WOLFSSL_SHA_HELP_STRING "Enable SHA (default: enabled)")
-option(WOLFSSL_SHA ${WOLFSSL_SHA_HELP_STRING} "yes")
+add_option("WOLFSSL_SHA" ${WOLFSSL_SHA_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_SHA)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_SHA" "-DNO_OLD_TLS")
@@ -748,7 +886,7 @@ endif()
 
 # HC128
 set(WOLFSSL_HC128_HELP_STRING "Enable HC-128 (default: disabled)")
-option(WOLFSSL_HC128 ${WOLFSSL_HC128_HELP_STRING} "no")
+add_option("WOLFSSL_HC128" ${WOLFSSL_HC128_HELP_STRING} "no" "yes;no")
 
 if(NOT WOLFSSL_HC128)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_HC128")
@@ -768,35 +906,11 @@ endif()
 #       - Selftest
 
 # SHA224
-set(SHA224_DEFAULT "no")
-if(("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") OR
-    ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
-    if(NOT WOLFSSL_AFALG AND NOT WOLFSSL_DEVCRYPTO AND
-       (NOT WOLFSSL_FIPS OR ("${FIPS_VERSION}" STREQUAL "v2")))
-        set(SHA224_DEFAULT "yes")
-    endif()
-endif()
-
-set(WOLFSSL_SHA224_HELP_STRING "Enable wolfSSL SHA-224 support (default: enabled on x86_64/aarch64)")
-option(WOLFSSL_SHA224 ${WOLFSSL_SHA224_HELP_STRING} ${SHA224_DEFAULT})
-
 if(WOLFSSL_SHA224)
     list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_SHA224")
 endif()
 
 # SHA3
-set(SHA3_DEFAULT "no")
-if(("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") OR
-    ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
-    if(NOT WOLFSSL_FIPS OR ("${FIPS_VERSION}" STREQUAL "v2"))
-        set(SHA3_DEFAULT "yes")
-    endif()
-endif()
-
-set(WOLFSSL_SHA3_HELP_STRING "Enable wolfSSL SHA-3 support (default: enabled on x86_64/aarch64)")
-set(WOLFSSL_SHA3 ${SHA3_DEFAULT} CACHE STRING ${WOLFSSL_SHA3_HELP_STRING})
-set_property(CACHE WOLFSSL_SHA3 PROPERTY STRINGS "yes" "no" "small")
-
 if("${WOLFSSL_SHA3}" STREQUAL "small")
     list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_SHA3_SMALL")
     override_cache(WOLFSSL_SHA3 "yes")
@@ -807,10 +921,6 @@ if(WOLFSSL_SHA3 AND NOT WOLFSSL_32BIT)
 endif()
 
 # SHAKE256
-set(WOLFSSL_SHAKE256_HELP_STRING "Enable wolfSSL SHAKE256 support (default: enabled on x86_64/aarch64)")
-set(WOLFSSL_SHAKE256 "no" CACHE STRING ${WOLFSSL_SHAKE256_HELP_STRING})
-set_property(CACHE WOLFSSL_SHAKE256 PROPERTY STRINGS "yes" "no" "small")
-
 if(NOT WOLFSSL_SHAKE256)
     override_cache(WOLFSSL_SHAKE256 ${WOLFSSL_SHA3})
 endif()
@@ -832,7 +942,7 @@ if(WOLFSSL_FIPS)
 endif()
 
 set(WOLFSSL_POLY1305_HELP_STRING "Enable wolfSSL POLY1305 support (default: enabled)")
-option(WOLFSSL_POLY1305 ${WOLFSSL_POLY1305_HELP_STRING} ${POLY1305_DEFAULT})
+add_option("WOLFSSL_POLY1305" ${WOLFSSL_POLY1305_HELP_STRING} ${POLY1305_DEFAULT} "yes;no")
 
 # leanpsk and leantls don't need poly1305
 if(WOLFSSL_LEAN_PSK OR WOLFSSL_LEAN_TLS)
@@ -852,8 +962,7 @@ if(WOLFSSL_FIPS)
 endif()
 
 set(WOLFSSL_CHACHA_HELP_STRING "Enable CHACHA (default: enabled). Use `=noasm` to disable ASM AVX/AVX2 speedups")
-set(WOLFSSL_CHACHA ${CHACHA_DEFAULT} CACHE STRING ${WOLFSSL_CHACHA_HELP_STRING})
-set_property(CACHE WOLFSSL_CHACHA PROPERTY STRINGS "yes" "no" "noasm")
+add_option("WOLFSSL_CHACHA" ${WOLFSSL_CHACHA_HELP_STRING} ${CHACHA_DEFAULT} "yes;no;noasm")
 
 # leanpsk and leantls don't need chacha
 if(WOLFSSL_LEAN_PSK OR WOLFSSL_LEAN_TLS)
@@ -872,7 +981,7 @@ endif()
 
 # Hash DRBG
 set(WOLFSSL_HASH_DRBG_HELP_STRING "Enable Hash DRBG support (default: enabled)")
-option(WOLFSSL_HASH_DRBG ${WOLFSSL_HASH_DRBG_HELP_STRING} "yes")
+add_option("WOLFSSL_HASH_DRBG" ${WOLFSSL_HASH_DRBG_HELP_STRING} "yes" "yes;no")
 
 if(WOLFSSL_HASH_DRBG)
     list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_HASHDRBG")
@@ -894,7 +1003,7 @@ else()
 endif()
 
 set(WOLFSSL_FILESYSTEM_HELP_STRING "Enable Filesystem support (default: enabled)")
-option(WOLFSSL_FILESYSTEM ${WOLFSSL_FILESYSTEM_HELP_STRING} ${FILESYSTEM_DEFAULT})
+add_option("WOLFSSL_FILESYSTEM" ${WOLFSSL_FILESYSTEM_HELP_STRING} ${FILESYSTEM_DEFAULT} "yes;no")
 
 if(NOT WOLFSSL_FILESYSTEM)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_FILESYSTEM")
@@ -907,7 +1016,7 @@ endif()
 
 # Inline function support
 set(WOLFSSL_INLINE_HELP_STRING "Enable inline functions (default: enabled)")
-option(WOLFSSL_INLINE ${WOLFSSL_INLINE_HELP_STRING} "yes")
+add_option("WOLFSSL_INLINE" ${WOLFSSL_INLINE_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_INLINE)
     list(APPEND WOLFSSL_DEFINITIONS "-DNO_INLINE")
@@ -919,8 +1028,6 @@ endif()
 #       - CRL
 #       - CRL monitor
 #       - User crypto
-#       - NTRU
-#       - QSH
 #       - Whitewood netRandom client library
 #       - SNI
 #       - Max fragment length
@@ -931,9 +1038,34 @@ endif()
 #       - Secure renegotiation
 #       - Fallback SCSV
 
+set(WOLFSSL_SNI_HELP_STRING "Enable SNI (default: disabled)")
+add_option(WOLFSSL_SNI ${WOLFSSL_SNI_HELP_STRING} "no" "yes;no")
+
+if (WOLFSSL_SNI)
+   list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_TLS_EXTENSIONS" "-DHAVE_SNI")
+endif()
+
+
+set(WOLFSSL_TLSX_HELP_STRING "Enable all TLS Extensions (default: disabled)")
+add_option(WOLFSSL_TLSX ${WOLFSSL_TLSX_HELP_STRING} "no" "yes;no")
+
+if (WOLFSSL_TLSX)
+  list(APPEND WOLFSSL_DEFINITIONS
+    "-DHAVE_TLS_EXTENSIONS"
+    "-DHAVE_SNI"
+    "-DHAVE_MAX_FRAGMENT"
+    "-DHAVE_TRUNCATED_HMAC"
+    "-DHAVE_ALPN"
+    "-DHAVE_TRUSTED_CA")
+    if (WOLFSSL_ECC OR WOLFSSL_CURVE25519 OR WOLFSSL_CURVE448 OR WOLFSSL_TLS13)
+       list(APPEND WOLFSSL_DEFINITIONS  "-DHAVE_SUPPORTED_CURVES")
+    endif()
+endif()
+
+
 # Supported elliptic curves extensions
 set(WOLFSSL_SUPPORTED_CURVES_HELP_STRING "Enable Supported Elliptic Curves (default: enabled)")
-option(WOLFSSL_SUPPORTED_CURVES ${WOLFSSL_SUPPORTED_CURVES_HELP_STRING} "yes")
+add_option("WOLFSSL_SUPPORTED_CURVES" ${WOLFSSL_SUPPORTED_CURVES_HELP_STRING} "yes" "yes;no")
 
 if(WOLFSSL_SUPPORTED_CURVES)
     if(NOT WOLFSSL_ECC AND NOT WOLFSSL_CURVE25519 AND NOT WOLFSSL_CURVE448)
@@ -968,11 +1100,23 @@ if (WOLFSSL_TLS13)
         "-DHAVE_SUPPORTED_CURVES")
 endif()
 
-# TODO: - Session ticket
+# Session Ticket Extension
+set(WOLFSSL_SESSION_TICKET_HELP_STRING "Enable Session Ticket (default: disabled)")
+add_option("WOLFSSL_SESSION_TICKET" ${WOLFSSL_SESSION_TICKET_HELP_STRING} "no" "yes;no")
+
+if(WOLFSSL_NGINX OR WOLFSSL_WPAS OR WOLFSSL_HAPROXY OR WOLFSSL_LIGHTY)
+    override_cache(WOLFSSL_SESSION_TICKET "yes")
+endif()
+
+if(WOLFSSL_SESSION_TICKET)
+    list(APPEND WOLFSSL_DEFINITIONS
+        "-DHAVE_TLS_EXTENSIONS"
+        "-DHAVE_SESSION_TICKET")
+endif()
 
 # Extended master secret extension
 set(WOLFSSL_EXTENDED_MASTER_HELP_STRING "Enable Extended Master Secret (default: enabled)")
-option(WOLFSSL_EXTENDED_MASTER ${WOLFSSL_EXTENDED_MASTER_HELP_STRING} "yes")
+add_option("WOLFSSL_EXTENDED_MASTER" ${WOLFSSL_EXTENDED_MASTER_HELP_STRING} "yes" "yes;no")
 
 if(WOLFSSL_EXTENDED_MASTER)
     list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_EXTENDED_MASTER")
@@ -998,7 +1142,7 @@ endif()
 
 # Encrypt-then-mac
 set(WOLFSSL_ENC_THEN_MAC_HELP_STRING "Enable Encryptr-Then-Mac extension (default: enabled)")
-option(WOLFSSL_ENC_THEN_MAC ${WOLFSSL_ENC_THEN_MAC_HELP_STRING} "yes")
+add_option("WOLFSSL_ENC_THEN_MAC" ${WOLFSSL_ENC_THEN_MAC_HELP_STRING} "yes" "yes;no")
 
 if(WOLFSSL_APACHE_HTTPD)
     override_cache(WOLFSSL_ENC_THEN_MAC "no")
@@ -1015,7 +1159,7 @@ endif()
 # stunnel Support
 # TODO: rest of stunnel support
 set(WOLFSSL_STUNNEL_HELP_STRING "Enable stunnel (default: disabled)")
-option(WOLFSSL_STUNNEL ${WOLFSSL_STUNNEL_HELP_STRING} "no")
+add_option("WOLFSSL_STUNNEL" ${WOLFSSL_STUNNEL_HELP_STRING} "no" "yes;no")
 
 if(NOT WOLFSSL_PSK AND
    NOT WOLFSSL_LEAN_PSK AND
@@ -1029,7 +1173,7 @@ endif()
 
 # MD4
 set(WOLFSSL_MD4_HELP_STRING "Enable MD4 (default: disabled)")
-option(WOLFSSL_MD4 ${WOLFSSL_MD4_HELP_STRING} "no")
+add_option("WOLFSSL_MD4" ${WOLFSSL_MD4_HELP_STRING} "no" "yes;no")
 
 if(NOT WOLFSSL_MD4)
     # turn on MD4 if using stunnel
@@ -1045,7 +1189,7 @@ endif()
 # PWDBASED has to come after certservice since we want it on w/o explicit on
 # PWDBASED
 set(WOLFSSL_PWDBASED_HELP_STRING "Enable PWDBASED (default: disabled)")
-option(WOLFSSL_PWDBASED ${WOLFSSL_PWDBASED_HELP_STRING} "no")
+add_option("WOLFSSL_PWDBASED" ${WOLFSSL_PWDBASED_HELP_STRING} "no" "yes;no")
 
 if(NOT WOLFSSL_PWDBASED)
     if(WOLFSSL_OPENSSLEXTRA OR
@@ -1079,7 +1223,7 @@ if(WOLFSSL_SP_MATH)
 endif()
 
 set(WOLFSSL_FAST_MATH_HELP_STRING "Enable fast math ops (default: enabled on x86_64/aarch64)")
-option(WOLFSSL_FAST_MATH ${WOLFSSL_FAST_MATH_HELP_STRING} ${FASTMATH_DEFAULT})
+add_option("WOLFSSL_FAST_MATH" ${WOLFSSL_FAST_MATH_HELP_STRING} ${FASTMATH_DEFAULT} "yes;no")
 
 if(WOLFSSL_FAST_MATH)
     # turn off fastmath if leanpsk on or asn off (w/o DH and ECC)
@@ -1113,7 +1257,7 @@ else()
 endif()
 
 set(WOLFSSL_EXAMPLES_HELP_STRING "Enable examples (default: enabled)")
-option(WOLFSSL_EXAMPLES ${WOLFSSL_EXAMPLES_HELP_STRING} ${EXAMPLES_DEFAULT})
+add_option("WOLFSSL_EXAMPLES" ${WOLFSSL_EXAMPLES_HELP_STRING} ${EXAMPLES_DEFAULT} "yes;no")
 
 if(NOT WOLFSSL_FILESYSTEM OR
    NOT WOLFSSL_INLINE OR
@@ -1128,8 +1272,11 @@ else()
     set(CRYPT_TESTS_DEFAULT "yes")
 endif()
 
-set(WOLFSSL_CRYPT_TESTS_HELP_STRING "Enable Crypt Bench/Test  (default: enabled)")
-option(WOLFSSL_CRYPT_TESTS ${WOLFSSL_CRYPT_TESTS_HELP_STRING} ${CRYPT_TESTS_DEFAULT})
+set(WOLFSSL_CRYPT_TESTS_HELP_STRING "Enable Crypt Bench/Test (default: enabled)")
+add_option("WOLFSSL_CRYPT_TESTS" ${WOLFSSL_CRYPT_TESTS_HELP_STRING} ${CRYPT_TESTS_DEFAULT} "yes;no")
+
+set(WOLFSSL_CRYPT_TESTS_LIBS_HELP_STRING "Build static libraries from the wolfCrypt test and benchmark sources (default: disabled)")
+add_option("WOLFSSL_CRYPT_TESTS_LIBS" ${WOLFSSL_CRYPT_TESTS_LIBS_HELP_STRING} "no" "yes;no")
 
 # TODO: - LIBZ
 #       - PKCS#11
@@ -1146,7 +1293,7 @@ option(WOLFSSL_CRYPT_TESTS ${WOLFSSL_CRYPT_TESTS_HELP_STRING} ${CRYPT_TESTS_DEFA
 
 # Asynchronous threading
 set(WOLFSSL_ASYNC_THREADS_HELP_STRING "Enable Asynchronous Threading (default: enabled)")
-option(WOLFSSL_ASYNC_THREADS ${WOLFSSL_ASYNC_THREADS_HELP_STRING} "yes")
+add_option("WOLFSSL_ASYNC_THREADS" ${WOLFSSL_ASYNC_THREADS_HELP_STRING} "yes" "yes;no")
 
 if(WOLFSSL_ASYNC_CRYPT AND WOLFSSL_ASYNC_THREADS)
     if(CMAKE_USE_PTHREADS_INIT)
@@ -1171,7 +1318,7 @@ endif()
 #       - AES key wrap
 
 set(WOLFSSL_OLD_NAMES_HELP_STRING "Keep backwards compat with old names (default: enabled)")
-option(WOLFSSL_OLD_NAMES ${WOLFSSL_OLD_NAMES_HELP_STRING} "yes")
+add_option("WOLFSSL_OLD_NAMES" ${WOLFSSL_OLD_NAMES_HELP_STRING} "yes" "yes;no")
 
 if(NOT WOLFSSL_OLD_NAMES AND NOT WOLFSSL_OPENSSL_COEXIST)
     list(APPEND WOLFSSL_DEFINITIONS
@@ -1186,7 +1333,7 @@ endif()
 
 # Support for enabling setting default DH parameters
 set(WOLFSSL_DH_DEFAULT_PARAMS_HELP_STRING "Enables option for default dh parameters (default: disabled)")
-option(WOLFSSL_DH_DEFAULT_PARAMS ${WOLFSSL_DH_DEFAULT_PARAMS_HELP_STRING} "no")
+add_option("WOLFSSL_DH_DEFAULT_PARAMS" ${WOLFSSL_DH_DEFAULT_PARAMS_HELP_STRING} "no" "yes;no")
 
 if(WOLFSSL_DH_DEFAULT_PARAMS OR NOT WOLFSSL_QT)
     override_cache(WOLFSSL_DH_DEFAULT_PARAMS "yes")
@@ -1204,10 +1351,10 @@ else()
 endif()
 
 set(WOLFSSL_USER_SETTINGS_HELP_STRING "Use your own user_settings.h and do not add Makefile CFLAGS (default: disabled)")
-option(WOLFSSL_USER_SETTINGS ${WOLFSSL_USER_SETTINGS_HELP_STRING} "no")
+add_option("WOLFSSL_USER_SETTINGS" ${WOLFSSL_USER_SETTINGS_HELP_STRING} "no" "yes;no")
 
 set(WOLFSSL_OPTFLAGS_HELP_STRING "Enable default optimization CFLAGS for the compiler (default: enabled)")
-option(WOLFSSL_OPTFLAGS ${WOLFSSL_OPTFLAGS_HELP_STRING} "yes")
+add_option("WOLFSSL_OPTFLAGS" ${WOLFSSL_OPTFLAGS_HELP_STRING} "yes" "yes;no")
 
 # Generates the BUILD_* flags. These control what source files are included in
 # the library. A series of AM_CONDITIONALs handle this in configure.ac.
@@ -1227,12 +1374,16 @@ endif()
 add_definitions(${WOLFSSL_DEFINITIONS})
 
 set(WOLFSSL_CONFIG_H_HELP_STRING "Enable generation of config.h and define HAVE_CONFIG_H (default: enabled)")
-option(WOLFSSL_CONFIG_H ${WOLFSSL_CONFIG_H_HELP_STRING} "yes")
+add_option("WOLFSSL_CONFIG_H" ${WOLFSSL_CONFIG_H_HELP_STRING} "yes" "yes;no")
 
 if(WOLFSSL_CONFIG_H)
     add_definitions("-DHAVE_CONFIG_H")
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.in"
                    "${CMAKE_CURRENT_BINARY_DIR}/config.h" )
+    set(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
+    set(abs_top_builddir ${CMAKE_CURRENT_BINARY_DIR})
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/wolfcrypt/test/test_paths.h.in"
+                   "${CMAKE_CURRENT_BINARY_DIR}/wolfcrypt/test/test_paths.h" )
 endif()
 
 # Suppress some warnings about separate compilation, inlining
@@ -1257,33 +1408,12 @@ file(APPEND ${OPTION_FILE} "#ifdef __cplusplus\n")
 file(APPEND ${OPTION_FILE} "extern \"C\" {\n")
 file(APPEND ${OPTION_FILE} "#endif\n\n")
 
-foreach(DEF IN LISTS WOLFSSL_DEFINITIONS)
-    if(DEF MATCHES "^-D")
-        if(DEF MATCHES "^-D(N)?DEBUG(=.+)?")
-            message("not outputting (N)DEBUG to ${OPTION_FILE}")
-        endif()
-
-        # allow user to ignore system options
-        if(DEF MATCHES "^-D_.*")
-            file(APPEND ${OPTION_FILE} "#ifndef WOLFSSL_OPTIONS_IGNORE_SYS\n")
-        endif()
-
-        string(REGEX REPLACE "^-D" "" DEF_NO_PREFIX ${DEF})
-        string(REGEX REPLACE "=.*$" "" DEF_NO_EQUAL_NO_VAL ${DEF_NO_PREFIX})
-        string(REPLACE "=" " " DEF_NO_EQUAL ${DEF_NO_PREFIX})
-
-        file(APPEND ${OPTION_FILE} "#undef  ${DEF_NO_EQUAL_NO_VAL}\n")
-        file(APPEND ${OPTION_FILE} "#define ${DEF_NO_EQUAL}\n")
-
-        if(DEF MATCHES "^-D_.*")
-            file(APPEND ${OPTION_FILE} "#endif\n")
-        endif()
-
-        file(APPEND ${OPTION_FILE} "\n")
-    else()
-        message("option w/o begin -D is ${DEF}, not saving to ${OPTION_FILE}")
-    endif()
-endforeach()
+add_to_options_file("${WOLFSSL_DEFINITIONS}" "${OPTION_FILE}")
+# CMAKE_C_FLAGS is just a string of space-separated flags to pass to the C
+# compiler. We need to replace those spaces with semicolons in order to treat it
+# as a CMake list.
+string(REPLACE " " ";" CMAKE_C_FLAGS_LIST "${CMAKE_C_FLAGS}")
+add_to_options_file("${CMAKE_C_FLAGS_LIST}" "${OPTION_FILE}")
 
 file(APPEND ${OPTION_FILE} "\n#ifdef __cplusplus\n")
 file(APPEND ${OPTION_FILE} "}\n")
@@ -1318,6 +1448,9 @@ set_target_properties(wolfssl
         VERSION ${LIBTOOL_FULL_VERSION}
 )
 
+target_compile_options(wolfssl PRIVATE "-DBUILDING_WOLFSSL")
+
+
 ####################################################
 # Include Directories
 ####################################################
@@ -1421,7 +1554,27 @@ if(WOLFSSL_EXAMPLES)
 endif()
 
 if(WOLFSSL_CRYPT_TESTS)
-    # Build wolfCrypt test
+    if(WOLFSSL_CRYPT_TESTS_LIBS)
+        # Build wolfCrypt test as a library. This will compile test.c and make
+        # its functions available as a CMake target that other CMake targets can
+        # pull in, in addition to producing the library itself. Note that this
+        # feature is not enabled by default, and the API of this library and
+        # wofcryptbench_lib should NOT be treated as stable.
+        add_library(wolfcrypttest_lib
+            ${CMAKE_CURRENT_SOURCE_DIR}/wolfcrypt/test/test.c)
+        set_target_properties(wolfcrypttest_lib PROPERTIES OUTPUT_NAME "wolfcrypttest")
+        target_link_libraries(wolfcrypttest_lib wolfssl)
+        target_compile_options(wolfcrypttest_lib PRIVATE "-DNO_MAIN_DRIVER")
+
+        # Make another library for the wolfCrypt benchmark code.
+        add_library(wolfcryptbench_lib
+            ${CMAKE_CURRENT_SOURCE_DIR}/wolfcrypt/benchmark/benchmark.c)
+        set_target_properties(wolfcryptbench_lib PROPERTIES OUTPUT_NAME "wolfcryptbench")
+        target_link_libraries(wolfcryptbench_lib wolfssl)
+        target_compile_options(wolfcryptbench_lib PRIVATE "-DNO_MAIN_DRIVER")
+    endif()
+
+    # Build wolfCrypt test executable.
     add_executable(wolfcrypttest
         ${CMAKE_CURRENT_SOURCE_DIR}/wolfcrypt/test/test.c)
     target_link_libraries(wolfcrypttest wolfssl)
@@ -1432,7 +1585,7 @@ if(WOLFSSL_CRYPT_TESTS)
                  PROPERTY RUNTIME_OUTPUT_NAME
                  testwolfcrypt)
 
-    # Build wolfCrypt benchmark
+    # Build wolfCrypt benchmark executable.
     add_executable(wolfcryptbench
         ${CMAKE_CURRENT_SOURCE_DIR}/wolfcrypt/benchmark/benchmark.c)
     target_include_directories(wolfcryptbench PRIVATE

ChangeLog.md

@@ -1,3 +1,455 @@
+# wolfSSL Release 5.0.0 (Nov 01, 2021)
+Release 5.0.0 of wolfSSL embedded TLS has bug fixes and new features including:
+
+### Vulnerabilities
+* [\Low\] Hang with DSA signature creation when a specific q value is used in a maliciously crafted key. If a DSA key with an invalid q value of either 1 or 0 was decoded and used for creating a signature, it would result in a hang in wolfSSL. Users that are creating signatures with DSA and are using keys supplied from an outside source are affected.
+* [\Low\] Issue with incorrectly validating a certificate that has multiple subject alternative names when given a name constraint. In the case where more than one subject alternative name is used in the certificate, previous versions of wolfSSL could incorrectly validate the certificate. Users verifying certificates with multiple alternative names and name constraints, are recommended to either use the certificate verify callback to check for this case or update the version of wolfSSL used. Thanks to Luiz Angelo Daros de Luca for the report.
+
+### New Feature Additions
+###### New Product
+* FIPS 140-3 -- currently undergoing laboratory testing, code review and ultimately CMVP validation. Targeting the latest FIPS standard.
+
+###### Ports
+* IoT-Safe with TLS demo
+* SE050 port with support for RNG, SHA, AES, ECC (sign/verify/shared secret) and ED25519
+* Support for Renesas TSIP v1.13 on RX72N
+
+###### Post Quantum
+* Support for OQS's (liboqs version 0.7.0) implementation of NIST Round 3 KEMs as TLS 1.3 groups --with-liboqs
+* Hybridizing NIST ECC groups with the OQS groups
+* Remove legacy NTRU and QSH
+* Make quantum-safe groups available to the compatibility layer
+
+###### Linux Kernel Module
+* Full support for FIPS 140-3, with in-kernel power on self test (POST) and conditional algorithm self test(s) (CAST)
+* --enable-linuxkm-pie -- position-independent in-kernel wolfCrypt container, for FIPS
+* Vectorized x86 acceleration in PK algs (RSA, ECC, DH, DSA) and AES/AES-GCM
+* Vectorized x86 acceleration in interrupt handlers
+* Support for Linux-native module signatures
+* Complete SSL/TLS and Crypto API callable from other kernel module(s)
+* Support for LTS kernel lines: 3.16, 4.4, 4.9, 5.4, 5.10
+
+###### Compatibility Layer Additions
+* Ports
+    - Add support for libssh2
+    - Add support for pyOpenSSL
+    - Add support for libimobiledevice
+    - Add support for rsyslog
+    - Add support for OpenSSH 8.5p1
+    - Add support for Python 3.8.5
+* API/Structs Added
+    - ERR_lib_error_string
+    - EVP_blake2
+    - wolfSSL_set_client_CA_list
+    - wolfSSL_EVP_sha512_224
+    - wolfSSL_EVP_sha512_256
+    - wc_Sha512_224/2256Hash
+    - wc_Sha512_224/256Hash
+    - wc_InitSha512_224/256
+    - wc_InitSha512_224/256_ex
+    - wc_Sha512_224/256Update
+    - wc_Sha512_224/256FinalRaw
+    - wc_Sha512_224/256Final
+    - wc_Sha512_224/256Free
+    - wc_Sha512_224/256GetHash
+    - wc_Sha512_224/256Copy
+    - wc_Sha512_224/256SetFlags
+    - wc_Sha512_224/256GetFlags
+    - wc_Sha512_224/256Transform
+    - EVP_MD_do_all and OBJ_NAME_do_all
+    - EVP_shake128
+    - EVP_shake256
+    - SSL_CTX_set_num_tickets
+    - SSL_CTX_get_num_tickets
+    - SSL_CIPHER_get_auth_nid
+    - SSL_CIPHER_get_cipher_nid
+    - SSL_CIPHER_get_digest_nid
+    - SSL_CIPHER_get_kx_nid
+    - SSL_CIPHER_is_aead
+    - SSL_CTX_set_msg_callback
+    - a2i_IPADDRESS
+    - GENERAL_NAME_print
+    - X509_VERIFY_PARAM_set1_ip
+    - EVP_CIPHER_CTX_set_iv_length
+    - PEM_read_bio_RSA_PUBKEY
+    - i2t_ASN1_OBJECT
+    - DH_set_length
+    - Set_tlsext_max_fragment_length
+    - AUTHORITY_iNFO_ACCESS_free
+    - EVP_PBE_scrypt
+    - ASN1_R_HEADER_TOO_LONG
+    - ERR_LIB
+    - X509_get_default_cert_file/file_env/dir/dir_env() stubs
+    - SSL_get_read_ahead/SSL_set_read_ahead()
+    - SSL_SESSION_has_ticket()
+    - SSL_SESSION_get_ticket_lifetime_hint()
+    - DIST_POINT_new
+    - DIST_POINT_free 
+    - DIST_POINTS_free
+    - CRL_DIST_POINTS_free
+    - sk_DIST_POINT_push
+    - sk_DIST_POINT_value
+    - sk_DIST_POINT_num
+    - sk_DIST_POINT_pop_free
+    - sk_DIST_POINT_free
+    - X509_get_extension_flags
+    - X509_get_key_usage
+    - X509_get_extended_key_usage
+    - ASN1_TIME_to_tm
+    - ASN1_TIME_diff
+    - PEM_read_X509_REQ
+    - ERR_load_ERR_strings
+    - BIO_ssl_shutdown
+    - BIO_get_ssl
+    - BIO_new_ssl_connect
+    - BIO_set_conn_hostname
+    - NID_pkcs9_contentType
+
+###### Misc.
+* KCAPI: add support for using libkcapi for crypto (Linux Kernel)
+* Configure option for --with-max-rsa-bits= and --with-max-ecc-bits=
+* SP ARM Thumb support for Keil and performance improvements
+* Add support for WOLFSSL_VERIFY_POST_HANDSHAKE verify mode
+* PKCS #11: support static linking with PKCS #11 library --enable-pkcs11=static LIBS=-l
+* Add build option --enable-wolfclu for use with wolfCLU product
+* Add support for X9.42 header i.e “BEGIN X9.42 DH PARAMETERS”
+* Add --enable-altcertchains for configuring wolfSSL with alternate certificate chains feature enabled
+* Add public API wc_RsaKeyToPublicDer_ex to allow getting RSA public key without ASN.1 header (can return only seq + n + e)
+* Add SNI and TLSx options to CMake build
+
+### Fixes
+###### PORT Fixes
+* Add return value checking for FREESCALE_RNGA
+* Fix MMCAU_SHA256 type warnings
+* Fixes for building with Microchip XC32 and ATECC
+
+###### Math Library Fixes
+* TFM check that the modulus length is valid for fixed data array size
+* TFM fp_submod_ct fix check for greater
+* Check return value of mp_grow in mp_mod_2d
+* Fix for ECC point multiply to error out on large multipliers
+* SP ECC error on multiplier larger than curve order
+
+###### TLS 1.3
+* TLS1.3 sanity check for cases where a private key is larger than the configured maximum
+* Fix early data max size handling in TLS v1.3
+* Fixes for PK callbacks with TLS v1.3
+* Check min downgrade when no extensions are sent with the ServerHello
+
+###### Misc.
+* Previously wolfSSL enum values were used as NID’s. Now only the compatibility layer NID enums are the NID values:
+    - CTC_SHAwDSA -> NID_dsaWithSHA1
+    - CTC_SHA256wDSA -> NID_dsa_with_SHA256
+    - CTC_MD2wRSA -> NID_md2WithRSAEncryption
+    - CTC_MD5wRSA -> NID_md5WithRSAEncryption
+    - CTC_SHAwRSA -> NID_sha1WithRSAEncryption
+    - CTC_SHA224wRSA -> NID_sha224WithRSAEncryption
+    - CTC_SHA256wRSA -> NID_sha256WithRSAEncryption
+    - CTC_SHA384wRSA -> NID_sha384WithRSAEncryption
+    - CTC_SHA512wRSA -> NID_sha512WithRSAEncryption
+    - CTC_SHA3_224wRSA -> NID_RSA_SHA3_224
+    - CTC_SHA3_256wRSA -> NID_RSA_SHA3_256
+    - CTC_SHA3_384wRSA -> NID_RSA_SHA3_384
+    - CTC_SHA3_512wRSA -> NID_RSA_SHA3_512
+    - CTC_SHAwECDSA -> NID_ecdsa_with_SHA1
+    - CTC_SHA224wECDSA -> NID_ecdsa_with_SHA224
+    - CTC_SHA256wECDSA -> NID_ecdsa_with_SHA256
+    - CTC_SHA384wECDSA -> NID_ecdsa_with_SHA384
+    - CTC_SHA512wECDSA -> NID_ecdsa_with_SHA512
+    - CTC_SHA3_224wECDSA -> NID_ecdsa_with_SHA3_224
+    - CTC_SHA3_256wECDSA -> NID_ecdsa_with_SHA3_256
+    - CTC_SHA3_384wECDSA -> NID_ecdsa_with_SHA3_384
+    - CTC_SHA3_512wECDSA -> NID_ecdsa_with_SHA3_512
+    - DSAk -> NID_dsa
+    - RSAk -> NID_rsaEncryption
+    - ECDSAk -> NID_X9_62_id_ecPublicKey
+    - BASIC_CA_OID -> NID_basic_constraints
+    - ALT_NAMES_OID -> NID_subject_alt_name
+    - CRL_DIST_OID -> NID_crl_distribution_points
+    - AUTH_INFO_OID -> NID_info_access
+    - AUTH_KEY_OID -> NID_authority_key_identifier
+    - SUBJ_KEY_OID -> NID_subject_key_identifier
+    - INHIBIT_ANY_OID -> NID_inhibit_any_policy
+* Fix for DES IV size used with FIPSv2
+* Fix signed comparison issue with serialSz
+* Fix missing CBIOSend and properly guard hmac in DupSSL()
+* Fix calculation of length of encoding in ssl.c
+* Fix encoding to check proper length in asn.c
+* Fix for wc_ecc_ctx_free and heap hint
+* Fix for debug messages with AF_ALG build
+* Fix for static memory with bucket size matching.
+* Fixes for SRP with heap hint.
+* Fixes for CAAM build macros and spelling for Keil build
+* Sniffer fix for possible math issue around 64-bit pointer and 32-bit unsigned int
+* Fix for sniffer TCP sequence rollover
+* wolfSSL_PEM_write_bio_PUBKEY to write only the public part
+* Fix for sending only supported groups in TLS extension
+* Fix for sniffer to better handle spurious retransmission edge case
+* SSL_set_alpn_protos and SSL_CTX_set_alpn_protos now returns 0 on successFixes issue with SSL_CTX_set1_curves_list and SSL_set1_curves_list not checking the last character of the names variable provided, non-0 on failure to better match expected return values
+* Fixes and improvements for crypto callbacks with TLS (mutual auth)
+* Fix for bad memory_mutex lock on static memory cleanup
+* Zero terminate name constraints strings when parsing certificates
+* Fix for verifying a certificate when multiple permitted name constraints are used
+* Fix typo in ifdef for HAVE_ED448
+* Fix typos in comments in SHA512
+* Add sanity check on buffer size with ED25519 key decode
+* Sanity check on PKCS7 stream amount read
+* PKCS7 fix for double free on error case and sanity check on set serial number
+* Sanity check on PKCS7 input size wc_PKCS7_ParseSignerInfo
+* Forgive a DTLS session trying to send too much at once
+
+### Improvements/Optimizations
+###### Build Options and Warnings
+* Rework of RC4 disable by default and depreciation
+* wolfSSL as a Zephyr module (without setup.sh)
+* Add include config.h to bio.c
+* Support for PKCS7 without AES CBC.
+* Fixes for building without AES CBC
+* Added WOLFSSL_DH_EXTRA to --enable-all and --enable-sniffer
+* Add a CMake option to build wolfcrypt test and bench code as libraries
+* GCC makefile: allow overriding and provide more flexibility
+
+###### Math Libraries
+* Improve performance of fp_submod_ct() and fp_addmod_ct()
+* Improve performance of sp_submod_ct() and sp_addmod_ct()
+* SP int, handle even modulus with exponentiation
+
+###### Misc.
+* Cleanups for Arduino examples and memory documentation
+* Refactor hex char to byte conversions
+* Added GCC-ARM TLS server example
+* Improvements to session locking to allow per-row
+* Improved sniffer statistics and documentation
+* EVP key support for heap hint and crypto callbacks
+* Reduced stack size for dh_generation_test and Curve ASN functions
+* Espressif README Syntax / keyword highlighting / clarifications
+* AARCH64 SHA512: implementation using crypto instructions added
+* wc_RsaPSS_CheckPadding_ex2 added for use with HEAP hint
+* wc_AesKeyWrap_ex and wc_AesKeyUnWrap_ex bound checks on input and output sizes
+* Add additional error handling to wolfSSL_BIO_get_len
+* Add code to use popen and the command 'host', useful with qemu
+* Adjustment to subject alt names order with compatibility layer to better match expected order
+* Reduce BIO compatibility layer verbosity
+* Set a default upper bound on error queue size with compatibility layer
+* WOLFSSL_CRL_ALLOW_MISSING_CDP macro for Skip CRL verification in case no CDP in peer cert
+* Fixes for scan-build LLVM-13 and expanded coverage
+* Increase the default DTLS_MTU_ADDITIONAL_READ_BUFFER and make it adjustable
+
+# wolfSSL Release 4.8.1 (July 16, 2021)
+Release 4.8.1 of wolfSSL embedded TLS has an OCSP vulnerability fix:
+
+### Vulnerabilities
+* [High] OCSP verification issue when response is for a certificate with no relation to the chain in question BUT that response contains the NoCheck extension which effectively disables ALL verification of that one cert. Users who should upgrade to 4.8.1 are TLS client users doing OCSP, TLS server users doing mutual auth with OCSP, and CertManager users doing OCSP independent of TLS. Thanks to Jan Nauber, Marco Smeets, Werner Rueschenbaum and Alissa Kim of Volkswagen Infotainment for the report.
+
+
+# wolfSSL Release 4.8.0 (July 09, 2021)
+Release 4.8.0 of wolfSSL embedded TLS has bug fixes and new features including:
+
+### Vulnerabilities
+* [Low] CVE-2021-37155: OCSP request/response verification issue. In the case that the serial number in the OCSP request differs from the serial number in the OCSP response the error from the comparison was not resulting in a failed verification. We recommend users that have wolfSSL version 4.6.0 and 4.7.0 with OCSP enabled update their version of wolfSSL. Version 4.5.0 and earlier are not affected by this report. Thanks to Rainer Mueller-Amersdorffer, Roee Yankelevsky, Barak Gutman, Hila Cohen and Shoshi Berko (from CYMOTIVE Technologies and CARIAD) for the report.
+* [Low] CVE-2021-24116: Side-Channel cache look up vulnerability in base64 PEM decoding for versions of wolfSSL 4.5.0 and earlier. Versions 4.6.0 and up contain a fix and do not need to be updated for this report. If decoding a PEM format private key using version 4.5.0 and older of wolfSSL then we recommend updating the version of wolfSSL used. Thanks to Florian Sieck, Jan Wichelmann, Sebastian Berndt and Thomas Eisenbarth for the report. 
+
+### New Feature Additions
+###### New Product
+* Added wolfSentry build with --enable-wolfsentry and tie-ins to wolfSSL code for use with wolfSentry
+
+###### Ports
+* QNX CAAM driver added, supporting ECC black keys, CMAC, BLOBs, and TRNG use
+*  _WIN32_WCE wolfCrypt port added
+* INTIME_RTOS directory support added
+* Added support for STM32G0
+* Renesas RX: Added intrinsics for rot[rl], revl (thanks @rliebscher)
+* Added support for running wolfcrypt/test/testwolfcrypt on Dolphin emulator to test DEVKITPRO port
+* Zephyr project port updated to latest version 2.6.X
+
+###### ASN1 and PKCS
+* Storing policy constraint extension from certificate added
+* Added support for NID_favouriteDrink pilot
+* Added the API function wc_EncryptPKCS8Key to handle encrypting a DER, PKCS#8-formatted key
+
+###### Compatibility Layer Additions
+* Open Source PORTS Added/Updated
+    - OpenVPN
+    - OpenLDAP
+    - socat-1.7.4.1
+    - Updated QT port for 5.15.2
+* Changes to extend set_cipher_list() compatibility layer API to have set_ciphersuites compatibility layer API capability
+* Added more support for SHA3 in the EVP layer
+* API Added
+    - MD5/MD5_Transform
+    - SHA/SHA_Transform/SHA1_Transform
+    - SHA224/SHA256_Transform/SHA512_Transform
+    - SSL_CTX_get0_param/SSL_CTX_set1_param
+    - X509_load_crl_file
+    - SSL_CTX_get_min_proto_version
+    - EVP_ENCODE_CTX_new
+    - EVP_ENCODE_CTX_free
+    - EVP_EncodeInit
+    - EVP_EncodeUpdate
+    - EVP_EncodeFinal
+    - EVP_DecodeInit
+    - EVP_DecodeUpdate
+    - EVP_DecodeFinal
+    - EVP_PKEY_print_public
+    - BIO_tell
+    - THREADID_current
+    - THREADID_hash
+    - SSL_CTX_set_ecdh_auto
+    - RAND_set_rand_method()
+    - X509_LOOKUP_ctrl()
+    - RSA_bits
+    - EC_curve_nist2nid
+    - EC_KEY_set_group
+    - SSL_SESSION_set_cipher
+    - SSL_set_psk_use_session_callback
+    - EVP_PKEY_param_check
+    - DH_get0_pqg
+    - CRYPTO_get_ex_new_index
+    - SSL_SESSION_is_resumable
+    - SSL_CONF_cmd
+    - SSL_CONF_CTX_finish
+    - SSL_CTX_keylog_cb_func
+    - SSL_CTX_set_keylog_callback
+    - SSL_CTX_get_keylog_callback
+
+###### Misc.
+* Added wolfSSL_CTX_get_TicketEncCtx getter function to return the ticket encryption ctx value
+* Added wc_AesKeyWrap_ex and wc_AesKeyUnWrap_ex APIs to accept an Aes object to use for the AES operations
+* Added implementation of AES-GCM streaming (--enable-aesgcm-stream)
+* Added deterministic generation of k with ECC following RFC6979 when the macro WOLFSSL_ECDSA_DETERMINISTIC_K is defined and wc_ecc_set_deterministic function is called
+* Implemented wc_DsaParamsDecode and wc_DsaKeyToParamsDer
+* Asynchronous support for TLS v1.3 TLSX ECC/DH key generation and key agreement
+* Added crypto callback support for Ed/Curve25519 and SHA2-512/384
+* TLS 1.3 wolfSSL_key_update_response function added to see if a update response is needed
+
+### Fixes
+* Fix for detecting extra unused bytes that are in an ASN1 sequence appended to the end of a valid ECC signature
+* Fix for keyid with ktri CMS (breaks compatibility with previous keyid ASN1 syntax)
+* Fix for failed handshake if a client offers more than 150 cipher suites. Thanks to Marcel Maehren, Philipp Nieting, Robert Merget from Ruhr University Bochum Sven Hebrok, Juraj Somorovsky from Paderborn University
+* Fix for default order of deprecated elliptic curves SECP224R1, SECP192R1, SECP160R1. Thanks to Marcel Maehren, Philipp Nieting, Robert Merget from Ruhr University Bochum Sven Hebrok, Juraj Somorovsky from Paderborn University
+* Fix for corner TLS downgrade case where a TLS 1.3 setup that allows for downgrades but has TLS 1.3 set as the minimum version would still downgrade to TLS 1.2
+
+###### PKCS7 (Multiple fixes throughout regarding memory leaks with SMIME and heap buffer overflows due to streaming functionality)
+* Fix PKCS7 dynamic content save/restore in PKCS7_VerifySignedData
+* Fix for heap buffer overflow on compare with wc_PKCS7_DecryptKtri
+* Fix for heap buffer overflow with wc_PKCS7_VerifySignedData
+* Fix for heap buffer overflow with wc_PKCS7_DecodeEnvelopedData
+* Check size of public key used with certificate passed into wc_PKCS7_InitWithCert before XMEMCPY to avoid overflow
+* Fix for heap buffer overflow fix for wolfSSL_SMIME_read_PKCS7
+* Fix to cleanly free memory in error state with wolfSSL_SMIME_read_PKCS7
+* SMIME error checking improvements and canonicalize multi-part messages before hashing
+
+###### DTLS Fixes
+* DTLS fix to correctly move the Tx sequence number forward
+* DTLS fix for sequence and epoch number with secure renegotiation cookie exchange
+* Fix for Chacha-Poly AEAD for DTLS 1.2 with secure renegotiation
+
+###### PORT Fixes
+* Fix AES, aligned key for the HW module with DCP port
+* Fix ATECC608A TNGTLS certificate size issue (thanks @vppillai)
+* Fixes for mingw compile warnings
+* Fixes for NXP LTC ECC/RSA
+* Fix ESP32 RSA hw accelerator initialization issue
+* Fixes for STM32 PKA with ECC
+* Fixes for STM32 AES GCM for HAL's that support byte sized headers
+* Espressif ESP32 SHA_CTX macro conflict resolved
+
+###### Math Library Fixes
+* For platforms that support limits.h or windows make sure both SIZEOF_LONG_LONG and SIZEOF_LONG are set to avoid issues with CTC_SETTINGS
+* SP C 32/64: fix corner cases around subtraction affecting RSA PSS use
+* Fix to return the error code from sp_cond_swap_ct when malloc fails
+* Fix potential memory leak with small stack in the function fp_gcd
+* Static Analysis Fixes
+* Fixes made from Coverity analysis including:
+* Cleanups for some return values,
+* Fix for leak with wolfSSL_a2i_ASN1_INTEGER
+* Sanity check on length in wolfSSL_BN_rand
+* Sanity check size in TLSX_Parse catching a possible integer overflow
+* Fixes found with -fsanitize=undefined testing
+* Fix null dereferences or undefined memcpy calls
+* Fix alignment in myCryptoDevCb
+* Fix default DTLS context assignment
+* Added align configure option to force data alignment
+
+###### Misc.
+* Fix for wolfSSL_ASN1_TIME_adj set length
+* Fix for freeing structure on error case in the function AddTrustedPeer
+* Return value of SSL_read when called after bidirectional shutdown
+* Fix for build options ./configure --enable-dtls --disable-asn
+* FIx for detection of a salt length from an RSA PSS signature
+* Fix to free up globalRNGMutex mutex when cleaning up global RNG
+* Fix leak when multiple hardware names are in SAN
+* Fix nonblocking ret value from CRL I/O callbacks
+* Fix wolfSSL_BIO_free_all return type to better match for compatibility layer
+* Fix for make distcheck, maintainer-clean, to allow distribution builds
+* Fix for async with fragmented packets
+* Fix for the build or RSA verify or public only
+* Fix for return value of wolfSSL_BIO_set_ssl to better match expected compatibility layer return value
+* Fix for sanity checks on size of issuer hash and key along with better freeing on error cases with DecodeBasicOcspResponse
+* Fix for potential memory leak with wolfSSL_OCSP_cert_to_id
+
+### Improvements/Optimizations
+###### DTLS/TLS Code Base
+* Improved TLS v1.3 time rollover support
+* TLS 1.3 PSK: use the hash algorithm to choose cipher suite
+* TLS Extended Master Secret ext: TLS13 - send in second Client Hello if in first
+* TLS Encrypt then MAC: check all padding bytes are the same value
+* wolfSSL_GetMaxRecordSize updated to now take additional cipher data into account
+* Updated session export/import with DTLS to handle a new internal options flag
+* Refactored dtls_expected_peer_handshake_number handling
+* Added wolfSSL_CTX_get_ephemeral_key and wolfSSL_get_ephemeral_key for loading a constant key in place of an ephemeral one
+* Improved checking of XSNPRINTF return value in DecodePolicyOID
+
+###### Build Options and Warnings
+* Added wolfSSL_CTX_set_verify to the ABI list
+* Adjusted FP_ECC build to not allow SECP160R1, SECP160R2, SECP160K1 and SECP224K1. FP_ECC does not work with scalars that are the length of the order when the order is longer than the prime.
+* Added CMake support for CURVE25519, ED25519, CURVE448, and ED448
+* cmake addition to test paths when building
+* Added support for session tickets in CMake
+* Added support for reproducible builds with CMake
+* Turn on reproducible-build by default when enable-distro
+* Windows Project: Include the X448 and Ed448 files
+* GCC-11 compile time warning fixes
+* Fix for compiling build of ./configure '--disable-tlsv12' '-enable-pkcallbacks'
+* Added build error for insecure build combination of secure renegotiation enabled with extended master secret disabled when session resumption is enabled
+* Updated building and running with Apple M1
+* Apache httpd build without TLS 1.3 macro guard added
+* Enable SHA3 and SHAKE256 requirements automatically when ED448 is enabled
+* Added option for AES CBC cipher routines to return BAD_LENGTH_E when called with an input buffer length not a multiple of AES_BLOCK_SIZE
+* Macro WOLFSSL_SP_INT_DIGIT_ALIGN added for alignment on buffers with SP build. This was needed for compiler building on a Renesas board.
+* Build support with no hashes enabled an no RNG compiled in
+* Allow use of FREESCALE hardware RNG without a specific port
+* Resolved some warnings with Windows builds and PBKDF disabled
+* Updated the version of autoconf and automake along with fixes for some new GCC-10 warnings
+
+###### Math Libraries
+* SP: Thumb implementation that works with clang
+* SP math all: sp_cmp handling of negative values
+* SP C ECC: mont sub - always normalize after sub before check for add
+* TFM math library prime checking, added more error checks with small stack build
+* Sanity checks on 0 value with GCD math function
+* fp_exptmod_ct error checking and small stack variable free on error
+* Sanity check on supported digit size when calling mp_add_d in non fastmath builds
+* Support for mp_dump with SP Math ALL
+* WOLFSSL_SP_NO_MALLOC for both the normal SP build and small SP build now
+* WOLFSSL_SP_NO_DYN_STACK added for SP small code that is not small stack build to avoid dynamic stack
+
+###### PKCS 7/8
+* wc_PKCS7_DecodeCompressedData to optionally handle a packet without content wrapping
+* Added setting of content type parsed with PKCS7  wc_PKCS7_DecodeAuthEnvelopedData and wc_PKCS7_DecodeEnvelopedData
+* PKCS8 code improvements and refactoring
+
+###### Misc.
+* Sanity checks on null inputs to the functions wolfSSL_X509_get_serialNumber and wolfSSL_X509_NAME_print_ex
+* Added ARM CryptoCell support for importing public key with wc_ecc_import_x963_ex()
+* Improved checking for possible use of key->dp == NULL cases with ECC functions
+* Updated SHAKE256 to compile with NIST FIPS 202 standard and added support for OID values (thanks to strongX509)
+* Improved ECC operations when using WOLFSSL_NO_MALLOC
+* Added WOLFSSL_SNIFFER_FATAL_ERROR for an return value when sniffer is in a fatal state
+* Allow parsing spaces in Base64_SkipNewline
+* Issue callback when exceeding depth limit rather than error out with OPENSSL_EXTRA build
+* Added NXP LTC RSA key generation acceleration
+
 # wolfSSL Release 4.7.0 (February 16, 2021)
 Release 4.7.0 of wolfSSL embedded TLS has bug fixes and new features including:
 
@@ -7,6 +459,7 @@ Release 4.7.0 of wolfSSL embedded TLS has bug fixes and new features including:
 * Function wolfSSL_CTX_NoTicketTLSv12 added to enable turning off session tickets with TLS 1.2 while keeping TLS 1.3 session tickets available
 * Implement RFC 5705: Keying Material Exporters for TLS
 * Added --enable-reproducible-build flag for making more deterministic library outputs to assist debugging
+* Added support for S/MIME (Secure/Multipurpose Internet Mail Extensions) bundles
 
 ### Fixes
 * Fix to free mutex when cert manager is free’d
@@ -44,7 +497,7 @@ Release 4.7.0 of wolfSSL embedded TLS has bug fixes and new features including:
 * Out of directory builds resolved, wolfSSL can now be built in a separate directory than the root wolfssl directory
 
 ### Vulnerabilities
-* [HIGH] CVE-2021-3336: In earlier versions of wolfSSL there exists a potential man in the middle attack on TLS 1.3 clients. Malicious attackers with a privileged network position can impersonate TLS 1.3 servers and bypass authentication. Users that have applications with client side code and have TLS 1.3 turned on, should update to the latest version of wolfSSL. Users that do not have TLS 1.3 turned on, or that are server side only, are NOT affected by this report. For the code change see https://github.com/wolfSSL/wolfssl/pull/3676.
+* [HIGH] CVE-2021-3336: In earlier versions of wolfSSL there exists a potential man in the middle attack on TLS 1.3 clients. Malicious attackers with a privileged network position can impersonate TLS 1.3 servers and bypass authentication. Users that have applications with client side code and have TLS 1.3 turned on, should update to the latest version of wolfSSL. Users that do not have TLS 1.3 turned on, or that are server side only, are NOT affected by this report. For the code change see https://github.com/wolfSSL/wolfssl/pull/3676. Thanks to Aina Toky Rasoamanana and Olivier Levillain from Télécom SudParis for the report.
 * [LOW] In the case of using custom ECC curves there is the potential for a crafted compressed ECC key that has a custom prime value to cause a hang when imported. This only affects applications that are loading in ECC keys with wolfSSL builds that have compressed ECC keys and custom ECC curves enabled.
 * [LOW] With TLS 1.3 authenticated-only ciphers a section of the server hello could contain 16 bytes of uninitialized data when sent to the connected peer. This affects only a specific build of wolfSSL with TLS 1.3 early data enabled and using authenticated-only ciphers with TLS 1.3.
 
@@ -1659,9 +2112,9 @@ More info can be found on-line at //http://wolfssl.com/yaSSL/Docs.html
 
 - No filesystem build fixes for various configurations
 - Certificate generation now supports several extensions including KeyUsage,
-    SKID, AKID, and Ceritifcate Policies
+    SKID, AKID, and Certificate Policies
 - CRLs can be loaded from buffers as well as files now
-- SHA-512 Ceritifcate Signing generation
+- SHA-512 Certificate Signing generation
 - Fixes for sniffer reassembly processing
 
 See INSTALL file for build instructions.

IDE/ARDUINO/README.md

@@ -17,8 +17,8 @@ Step 2: Copy the directory wolfSSL that was just created to:
 
 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 below in wolfssl root.
-(See wolfssl/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h)
+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/

IDE/ARDUINO/sketches/wolfssl_client/wolfssl_client.ino

@@ -1,6 +1,6 @@
 /* wolfssl_client.ino
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -24,8 +24,8 @@
 #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
+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);
@@ -51,7 +51,7 @@ void setup() {
     Serial.println("unable to get ctx");
     return;
   }
-  // initialize wolfSSL using callback functions
+  /* initialize wolfSSL using callback functions */
   wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
   wolfSSL_SetIOSend(ctx, EthernetSend);
   wolfSSL_SetIORecv(ctx, EthernetReceive);
@@ -119,7 +119,10 @@ void loop() {
       if ((wolfSSL_write(ssl, msg, msgSz)) == msgSz) {
         
         Serial.print("Server response: ");
-        while (client.available() || wolfSSL_pending(ssl)) {
+        /* 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) {

IDE/ARDUINO/sketches/wolfssl_server/wolfssl_server.ino

@@ -1,6 +1,6 @@
 /* wolfssl_server.ino
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -31,7 +31,7 @@
   #error Please undefine NO_WOLFSSL_SERVER for this example
 #endif
 
-const int port = 11111; // port to listen on
+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);
@@ -59,12 +59,12 @@ void setup() {
     return;
   }
 
-  // initialize wolfSSL using callback functions
+  /* 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
+  /* 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) {
@@ -78,7 +78,7 @@ void setup() {
     return;
   }
 
-  // Start the server
+  /* Start the server */
   server.begin();
   
   return;
@@ -110,7 +110,7 @@ void loop() {
   int replySz = 0;
   const char* cipherName;
 
-  // Listen for incoming client requests.
+  /* Listen for incoming client requests. */
   client = server.available();
   if (!client) {
     return;
@@ -142,7 +142,10 @@ void loop() {
     Serial.println(cipherName);
 
     Serial.print("Server Read: ");
-    while (client.available() || wolfSSL_pending(ssl)) {
+    /* 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);
@@ -159,7 +162,7 @@ void loop() {
       }
     }
 
-    // echo data
+    /* echo data */
     if ((wolfSSL_write(ssl, reply, replySz)) != replySz) {
       err = wolfSSL_get_error(ssl, 0);
       wolfSSL_ERR_error_string(err, errBuf);

IDE/ARDUINO/wolfssl-arduino.sh

@@ -11,20 +11,29 @@ space(){
 }
 
 if [ "$DIR" = "ARDUINO" ]; then
-	rm -rf wolfSSL
-	mkdir wolfSSL
+	if [ ! -d "wolfSSL" ]; then
+	    mkdir wolfSSL
+    fi
 
     cp ../../src/*.c ./wolfSSL
     cp ../../wolfcrypt/src/*.c ./wolfSSL
 
-    mkdir wolfSSL/wolfssl
+    if [ ! -d "wolfSSL/wolfssl" ]; then
+	    mkdir wolfSSL/wolfssl
+    fi
     cp ../../wolfssl/*.h ./wolfSSL/wolfssl
-    mkdir wolfSSL/wolfssl/wolfcrypt
+    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
-    mkdir ./wolfSSL/wolfcrypt
-    mkdir ./wolfSSL/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
 
@@ -37,31 +46,36 @@ if [ "$DIR" = "ARDUINO" ]; then
     cp ./wolfSSL/wolfssl/bio.c ./wolfSSL/wolfcrypt/src/bio.c
     
     # copy openssl compatibility headers to their appropriate location
-    mkdir ./wolfSSL/wolfssl/openssl
+    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
 
-    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
+    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

IDE/Android/Android.bp

@@ -0,0 +1,116 @@
+cc_library_shared {
+
+    name: "libwolfssl",
+
+    arch: {
+        arm: {
+            instruction_set: "arm",
+        },
+        arm64: {
+            cflags: ["-DARM64"],
+        },
+    },
+    compile_multilib: "both",
+    export_include_dirs: ["."],
+    shared_libs: ["liblog"],
+    cflags: [
+        "-DWOLFSSL_USER_SETTINGS",
+        "-Os",
+        "-fomit-frame-pointer",
+    ],
+    include_dirs: [
+        "external/wolfssl/wolfssl",
+        "external/wolfssl",
+    ],
+
+    srcs: [
+        "./src/crl.c",
+        "./src/internal.c",
+        "./src/keys.c",
+        "./src/ocsp.c",
+        "./src/sniffer.c",
+        "./src/ssl.c",
+        "./src/tls.c",
+        "./src/tls13.c",
+        "./src/wolfio.c",
+    ] + [
+        "./wolfcrypt/src/aes.c",
+        "./wolfcrypt/src/arc4.c",
+        "./wolfcrypt/src/asm.c",
+        "./wolfcrypt/src/asn.c",
+        "./wolfcrypt/src/blake2b.c",
+        "./wolfcrypt/src/blake2s.c",
+        "./wolfcrypt/src/camellia.c",
+        "./wolfcrypt/src/chacha.c",
+        "./wolfcrypt/src/chacha20_poly1305.c",
+        "./wolfcrypt/src/cmac.c",
+        "./wolfcrypt/src/coding.c",
+        "./wolfcrypt/src/compress.c",
+        "./wolfcrypt/src/cpuid.c",
+        "./wolfcrypt/src/cryptocb.c",
+        "./wolfcrypt/src/curve25519.c",
+        "./wolfcrypt/src/curve448.c",
+        "./wolfcrypt/src/des3.c",
+        "./wolfcrypt/src/dh.c",
+        "./wolfcrypt/src/dsa.c",
+        "./wolfcrypt/src/ecc.c",
+        "./wolfcrypt/src/ecc_fp.c",
+        "./wolfcrypt/src/ed25519.c",
+        "./wolfcrypt/src/ed448.c",
+        "./wolfcrypt/src/error.c",
+        "./wolfcrypt/src/fe_448.c",
+        "./wolfcrypt/src/fe_low_mem.c",
+        "./wolfcrypt/src/fe_operations.c",
+        "./wolfcrypt/src/fips.c",
+        "./wolfcrypt/src/fips_test.c",
+        "./wolfcrypt/src/ge_448.c",
+        "./wolfcrypt/src/ge_low_mem.c",
+        "./wolfcrypt/src/ge_operations.c",
+        "./wolfcrypt/src/hash.c",
+        "./wolfcrypt/src/kdf.c",
+        "./wolfcrypt/src/hc128.c",
+        "./wolfcrypt/src/hmac.c",
+        "./wolfcrypt/src/idea.c",
+        "./wolfcrypt/src/integer.c",
+        "./wolfcrypt/src/logging.c",
+        "./wolfcrypt/src/md2.c",
+        "./wolfcrypt/src/md4.c",
+        "./wolfcrypt/src/md5.c",
+        "./wolfcrypt/src/memory.c",
+        "./wolfcrypt/src/pkcs12.c",
+        "./wolfcrypt/src/pkcs7.c",
+        "./wolfcrypt/src/poly1305.c",
+        "./wolfcrypt/src/pwdbased.c",
+        "./wolfcrypt/src/rabbit.c",
+        "./wolfcrypt/src/random.c",
+        "./wolfcrypt/src/rc2.c",
+        "./wolfcrypt/src/ripemd.c",
+        "./wolfcrypt/src/rsa.c",
+        "./wolfcrypt/src/selftest.c",
+        "./wolfcrypt/src/sha256.c",
+        "./wolfcrypt/src/sha3.c",
+        "./wolfcrypt/src/sha512.c",
+        "./wolfcrypt/src/sha.c",
+        "./wolfcrypt/src/signature.c",
+        "./wolfcrypt/src/sp_arm32.c",
+        "./wolfcrypt/src/sp_arm64.c",
+        "./wolfcrypt/src/sp_armthumb.c",
+        "./wolfcrypt/src/sp_c32.c",
+        "./wolfcrypt/src/sp_c64.c",
+        "./wolfcrypt/src/sp_cortexm.c",
+        "./wolfcrypt/src/sp_dsp32.c",
+        "./wolfcrypt/src/sp_int.c",
+        "./wolfcrypt/src/sp_x86_64.c",
+        "./wolfcrypt/src/srp.c",
+        "./wolfcrypt/src/tfm.c",
+        "./wolfcrypt/src/wc_dsp.c",
+        "./wolfcrypt/src/wc_encrypt.c",
+        "./wolfcrypt/src/wc_pkcs11.c",
+        "./wolfcrypt/src/wc_port.c",
+        "./wolfcrypt/src/wolfcrypt_first.c",
+        "./wolfcrypt/src/wolfcrypt_last.c",
+        "./wolfcrypt/src/wolfevent.c",
+        "./wolfcrypt/src/wolfmath.c",
+    ],
+
+}

IDE/Android/README.md

@@ -0,0 +1,37 @@
+# Android wolfSSL Support
+
+Tested on Android v8.1 with WPA Supplicant and KeyStore to replace BoringSSL.
+
+## Files
+
+* `Android.bp`: Template build system file for wolfSSL.
+* `user_settings.h`: Template build settings for wolfSSL
+
+## Installation
+
+1) Place the wolfSSL library into `./external/wolfssl`
+2) Copy `Android.bp` into `./external/wolfssl`
+3) Copy `user_settings.h` into `./external/wolfssl`
+4) Add `PRODUCT_PACKAGES += libwolfssl` to your device .mk.
+
+## Typical Android build instruction
+
+```sh
+source build/envsetup.sh
+lunch [num]
+mm -j8
+```
+
+## Using wolfSSL in your Application
+
+In your `Android.mk` build file for your application add the following:
+
+```makefile
+# Crypto Provider - wolfSSL
+LOCAL_CFLAGS += -DWOLFSSL_USER_SETTINGS -Iexternal/wolfssl -Iexternal/wolfssl/wolfssl
+LOCAL_SHARED_LIBRARIES += libwolfssl
+```
+
+## Support
+
+For questions please email support@wolfssl.com

IDE/Android/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/Android/Android.bp \
+    IDE/Android/README.md \
+    IDE/Android/user_settings.h

IDE/Android/user_settings.h

@@ -0,0 +1,112 @@
+/* Custom build settings for Android */
+
+#ifndef _WOLF_USER_SETTINGS_H_
+#define _WOLF_USER_SETTINGS_H_
+
+#if 0
+    #define HAVE_FIPS_VERSION 2
+    #define HAVE_FIPS
+#endif
+
+/* WPA Supplicant Support */
+#define WOLFSSL_WPAS_SMALL
+#define OPENSSL_ALL
+#define HAVE_THREAD_LS
+
+#define USE_FAST_MATH
+#define TFM_TIMING_RESISTANT
+#define ECC_TIMING_RESISTANT
+#define WC_RSA_BLINDING
+
+#define HAVE_HASHDRBG
+
+#if 1
+    #define WOLFSSL_TLS13
+    #define WC_RSA_PSS
+#endif
+#define HAVE_SESSION_TICKET
+#define HAVE_TLS_EXTENSIONS
+#define HAVE_SUPPORTED_CURVES
+#define HAVE_EXTENDED_MASTER
+#define HAVE_ENCRYPT_THEN_MAC
+#define WOLFSSL_ENCRYPTED_KEYS
+#define HAVE_KEYING_MATERIAL
+#define NO_OLD_TLS
+#define NO_CHECK_PRIVATE_KEY
+
+/* enable PK callback support for signing operations to key store */
+#define HAVE_PK_CALLBACKS
+/* crypto callback support is not in FIPS 3389 */
+#ifndef HAVE_FIPS
+    #define WOLF_CRYPTO_CB 
+#endif
+
+#define KEEP_OUR_CERT
+#define KEEP_PEER_CERT
+#define WOLFSSL_ALWAYS_VERIFY_CB
+#define WOLFSSL_ALWAYS_KEEP_SNI
+#define HAVE_EX_DATA
+#define HAVE_EXT_CACHE
+#define WOLFSSL_EITHER_SIDE
+#define WOLFSSL_PUBLIC_MP
+#define WOLFSSL_DER_LOAD
+
+#define WOLFSSL_CERT_GEN
+#define WOLFSSL_CERT_EXT
+#define WOLFSSL_CERT_REQ
+
+#define WOLFSSL_KEY_GEN
+#define WC_RSA_NO_PADDING
+
+#define HAVE_FFDHE_2048
+#define HAVE_DH_DEFAULT_PARAMS
+#ifdef HAVE_FIPS
+    #define WOLFSSL_VALIDATE_FFC_IMPORT
+    #define HAVE_FFDHE_Q
+#endif
+
+#define WOLFSSL_SHA224
+#define WOLFSSL_SHA512
+#define WOLFSSL_SHA384
+
+#define HAVE_HKDF
+#define HAVE_PKCS8
+
+#define HAVE_ECC
+#define TFM_ECC256
+#define ECC_SHAMIR
+#define HAVE_COMP_KEY
+#ifdef HAVE_FIPS
+    #define HAVE_ECC_CDH
+    #define WOLFSSL_VALIDATE_ECC_IMPORT
+#endif
+
+#define HAVE_AESGCM
+#define HAVE_AESCCM
+#define WOLFSSL_AES_DIRECT
+#define WOLFSSL_AES_COUNTER
+#define HAVE_AES_ECB
+#define WOLFSSL_CMAC
+
+#define WOLFSSL_BASE64_ENCODE
+#define HAVE_CRL
+
+#define NO_DSA
+#define NO_RC4
+#define NO_HC128
+#define NO_RABBIT
+#define NO_RC4
+#define NO_PSK
+#define WOLFSSL_NO_SHAKE256
+#define NO_MD4
+#define NO_OLD_MD5_NAME
+#define NO_OLD_SHA_NAMES
+#define NO_OLD_SHA256_NAMES
+#define NO_OLD_WC_NAMES
+
+#if 0
+    #define DEBUG_WOLFSSL
+    #define WOLFSSL_ANDROID_DEBUG
+#endif
+
+#endif /* _WOLF_USER_SETTINGS_H_ */

IDE/CRYPTOCELL/main.c

@@ -1,6 +1,6 @@
 /* main.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -18,6 +18,7 @@
  * 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 <wolfcrypt/test/test.h>
 #include <wolfcrypt/benchmark/benchmark.h>

IDE/CRYPTOCELL/user_settings.h

@@ -1,6 +1,6 @@
 /* user_settings.h
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -41,6 +41,7 @@ extern "C" {
 #endif
 
 #if defined(WOLFSSL_CRYPTOCELL)
+    /* see SASI_AES_KEY_MAX_SIZE_IN_BYTES in the nRF5 SDK */
     #define AES_MAX_KEY_SIZE    128
 #endif /* WOLFSSL_CRYPTOCELL*/
 
@@ -137,6 +138,9 @@ extern "C" {
 #if 1
     #define HAVE_ECC
 
+    #include <strings.h>
+    /* strings.h required for strncasecmp */
+
     /* Manually define enabled curves */
     #undef  ECC_USER_CURVES
     #define ECC_USER_CURVES

IDE/ECLIPSE/DEOS/README.md

@@ -1,71 +1,64 @@
-
-
 # Deos Port
+
 ## Overview
-You can enable the wolfSSL support for Deos RTOS available [here](https://www.ddci.com/products_deos_do_178c_arinc_653/) using the `#define WOLFSSL_DEOS`.
-Deos is a time & space partitioned, multi-core enabled, DO-178C DAL A certifiable RTOS.
+
+You can enable the wolfSSL support for Deos RTOS available
+[here](https://www.ddci.com/products_deos_do_178c_arinc_653/) using
+the `#define WOLFSSL_DEOS`.  Deos is a time & space partitioned,
+multi-core enabled, DO-178C DAL A certifiable RTOS.
+
 ## Usage
 
-You can start with your OpenArbor IDE-based example project for Deos with the network stack (lwip) to integrate wolfSSL source code.
+You can start with your OpenArbor IDE-based example project for Deos
+with the network stack (lwip) to integrate wolfSSL source code.
 
-wolfSSL supports a compile-time user configurable options in the `IDE/ECLIPSE/DEOS/user_settings.h` file.
+wolfSSL supports a compile-time user configurable options in the
+`IDE/ECLIPSE/DEOS/user_settings.h` file.
 
-The `tls_wolfssl.c` example application provides a simple function to run the selected examples at compile time through the following four #defines in user_settings.h. You can undefine any of these macro options to run a test.
-```
-       1. #undef NO_CRYPT_TEST
-       2. #undef NO_CRYPT_BENCHMARK
-       3. #undef NO_WOLFSSL_CLIENT
-       4. #undef NO_WOLFSSL_SERVER
-```
-Do one of the following steps for building and running wolfSSL with the Deos kernel examples, which are included in the DDS release:
-If you want to create a project from scratch, skip the Importing the project section and follow the steps in the other sections.
+### Importing the project
 
-If you want to use an pre-configured example project, go to the Importing the project section, skip the other sections and follow the Building and Running section.
-
-#### Importing the project
 In this section you will import a pre-configured example project.
+
+Note: To work wolfssl directory must not be under the workspace directory.
+
 1. Launch the OpenArbor IDE as an administrator
-2. In the Workspace Launcher dialog, in the Workspace field, enter your
-workspace
+2. In the Workspace Launcher dialog, in the Workspace field, enter
+   your workspace
 3. Right-click in the Project Explorer view and select Import
-4. In the Import dialog, select General > Existing Projects into Workspace, then click Next.
-5. In the Import Projects dialog, select Select archive file, then browse to `IDE/ECLIPSE/DEOS/` and double-click `deosWolfssl.zip` file
+4. In the Import dialog, select General > Existing Projects into
+   Workspace, then click Next.
+5. In the Import Projects dialog, select `Select root directory` and
+   browse to `IDE/ECLIPSE/DEOS/deos_wolfssl` and select the wolfssl
+   project
 6. In the Import Projects dialog, click Finish
 
+#### Dependencies
+
+* ansi
+* gnu-language
+* deos-time
+
+### Setting up a Deos project with wolfSSL
+
+The `tls_wolfssl.c` example application provides a simple function to
+run the selected examples at compile time through the following four
+`#defines` in `user_settings.h`. You can undefine any of these macro
+options to run a test.
 
-#### Setting up a Deos project with wolfSSL
- 1. Download the wolfSSL source code or a zip file from GitHub. You can remove all of the files except for these folders and its contents. The top folder for this example is wolfsslPort.
 ```
-wolfsslPort
-      |-- IDE
-          | -- ECLIPSE
-               | -- DEOS
-      |-- src
-      |-- wolfcrypt
-          | -- benchmark
-          | -- src
-          | -- test
-      |-- wolfssl
-          |-- openssl
-          |-- wolfcrypt
-              |-- port
+#undef NO_CRYPT_TEST
+#undef NO_CRYPT_BENCHMARK
+#undef NO_WOLFSSL_CLIENT
+#undef NO_WOLFSSL_SERVER
 ```
- 2. Remove these two platform specific assembly source files:
-    -   wolfsslPort/wolfcrypt/src/aes_asm.asm
-    -   wolfsslPort/wolfcrypt/src/aes_asm.S
 
- 3. Launch the OpenArbor IDE as an administrator
- 4. Create a DDC-I Deos example project. In the main menu, go to File >DDC-I Deos example project > socket > udp-vs-tcp
- 5. Import the `wolfSSLPort` source code into your project.
-    -   Right-click the ` udp-vs-tcp` project and choose File -> Import.
-    -   Expand the General folder and select File System, then click Next. You should now see the Import File system dialog.
-    -   Browse to the location containing the wolfSSL code and choose OK. Select the `wolfsslPort` folder and check the `Create top-level folder` button, then select Finish. You should see the folder hierarchy the same as wolfSSL folder structures.
-6. Review the configuration in $(PROJECT_DIR)/wolfsslPort/IDE/ECLIPSE/DEOS/user_setting.h
+1. Launch the OpenArbor IDE
 
-7.  Review the custom malloc/realloc/free configuration $(PROJECT_DIR)/wolfsslPort/IDE/ECLIPSE/DEOS/deos_malloc.c . Memory allocated with malloc() is never freed.
+2. Create a DDC-I Deos example project. In the main menu, go to File >
+   DDC-I Deos example project > socket > udp-vs-tcp
+
+3. Customize your config/udp-vs-tcp.pd.xml with the following changes:
 
-#### Configuring the Deos Project
- 1. Customize your config/udp-vs-tcp.pd.xml with the following changes:
 ```
 <processTemplate
      mutexQuota = "5"
@@ -90,35 +83,54 @@ wolfsslPort
 
 </processTemplate>
 ```
-Depending on your configuration, wolfSSL uses upto four mutexes. You also need to configure enough memory for the stack of each threads and the process logical memory pool.
 
+Depending on your configuration, wolfSSL uses upto four mutexes. You
+also need to configure enough memory for the stack of each threads and
+the process logical memory pool.
+
+4. Right click on the `udp-vs-tcp` project, select properties and add
+   the following macros in the DDC-I Options > C Compile >
+   Preprocessor
+
+  * WOLFSSL_USER_SETTINGS
+
+5.  Add the following directory paths in the DDC-I Options > C Compile >
+    Directories and in the DDC-I Options > C++ Compile > Directories
+
+  * $(PROJECT_DIR.wolfssl)/../../../..
+  * $(PROJECT_DIR.wolfssl)/..
+  * $(PROJECT_DIR.printx)/code
+
+6.  Add the following library dependencies in the
+    DDC-I Options > Deos > Dependencies
+
+  * math
+  * ansi
+  * deos-time
+
+  For benchmark and test code:
+
+    * printx - You must add printx into your workspace, File >DDC-I
+      Deos example project > training > printx
+
+7.  Edit $(PROJECT_DIR)/wolfsslPort/IDE/ECLIPSE/DEOS/user_setting.h to
+    customize your configuration. For example, you can undef or define
+    these tests.
+
+ * `#undef NO_CRYPT_TEST`
+ * `#undef NO_CRYPT_BENCHMARK`
+ * `#undef NO_WOLFSSL_CLIENT`
+ * `#undef NO_WOLFSSL_SERVER`
+
+8.  Edit your application source file where main() thread is defined
+and add the following:
+
+  * #include "printx.h"
+  * #include "tls_wolfssl.h"
+  * and a call to `wolfsslRunTests()`
 
- 2. Right click on the `udp-vs-tcp` project, select properties and add the following macros in the DDC-I Options > C Compile > Preprocessor
-      -   DEOS_ALLOW_OBSOLETE_DEFINITIONS
-      -   WOLFSSL_USER_SETTINGS
- 3.  Add the following directory paths in the DDC-I Options > C Compile > Directories and in the DDC-I Options > C++ Compile > Directories
-      -   $(PROJECT_DIR)/wolfsslPort
-      -   $(PROJECT_DIR)/wolfsslPort/wolfssl
-      -   $(PROJECT_DIR)/wolfsslPort/IDE/ECLIPSE/DEOS
-      -   $(PROJECT_DIR.printx)/code
- 4.  Change the optimization level in the DDC-I Options > C Compile > Code Generation > Optimization level:g
-      -   g
- 5.  Add the following library dependencies in the DDC-I Options > Deos > Dependencies
-      -   math
-      -   dart
-      -   ansi
-      -   printx
-          - You must add printx into your workspace, File >DDC-I Deos example project > training > printx
- 6.  Edit $(PROJECT_DIR)/wolfsslPort/IDE/ECLIPSE/DEOS/user_setting.h to customize your configuration. For example, you can undef or define these tests.
-      -   #undef NO_CRYPT_TEST
-      -   #undef NO_CRYPT_BENCHMARK
-      -   #undef NO_WOLFSSL_CLIENT
-      -   #undef NO_WOLFSSL_SERVER
- 7.  Edit your application source file where main() thread is defined and add the following:
-      -   #include "printx.h"
-      -   #include "tls_wolfssl.h"
-      -   and a call to `wolfsslRunTests()`
 Here's an example:
+
 ```
 #include <deos.h>
 #include <printx.h>
@@ -137,7 +149,10 @@ int main(void)
 }
 
 ```
- 8.  Review $(PROJECT_DIR)/udp-vs-tcp/mailbox-transport.config configuration.
+
+9.  Review `$(PROJECT_DIR)/udp-vs-tcp/mailbox-transport.config`
+    configuration.
+
 ```
 transportConfigurationId
 2                              # Client thread quota - for client and server TCP
@@ -166,45 +181,62 @@ userServiceThread              # Server thread template name
 /
 ```
 
-   #### Building and Running
- 1.  Build your project, then load and run your image on a target platform. Review the test results on the console output.
+#### Building and Running
+
+1.  Build your project, then load and run your image on a target
+    platform. Review the test results on the console output.
 
 
 ### `wolfcrypt_test()`
-wolfcrypt_test() prints a message on the target console similar to the following output:
+
+`wolfcrypt_test()` prints a message on similar to the following:
+
 ```
 error    test passed!
 base64   test passed!
 asn      test passed!
 ...
 ```
+
 This example doesn't show the whole output.
 
 ### `benchmark_test()`
-benchmark_test() prints a message on the target console similar to the following output.
+
+`benchmark_test()` prints a message on the similar to the following:
 
 ```
 ------------------------------------------------------------------------------
- wolfSSL version 3.15.5
+wolfSSL version 4.6.0
 ------------------------------------------------------------------------------
 wolfCrypt Benchmark (block bytes 1024, min 1.0 sec each)
-RNG               225 KB tooks 1.026 seconds,  219.313 KB/s
-AES-128-CBC-enc    250 KB toks 1.105 seconds  226.210 KB/s
-AES-128-CBC-dec    225 KB tooks 1.005 seconds,  223.922 KB/s
+RNG                  2 MB took 1.000 seconds,    2.124 MB/s
+AES-128-CBC-enc      5 MB took 1.000 seconds,    5.127 MB/s
+AES-128-CBC-dec      5 MB took 1.000 seconds,    4.907 MB/s
+AES-192-CBC-enc      5 MB took 1.000 seconds,    4.736 MB/s
+AES-192-CBC-dec      5 MB took 1.000 seconds,    4.761 MB/s
 ...
 ```
+
 This example doesn't show the whole output.
 
 ### `wolfssl_client_test()`
 
-You can modify the `TCP_SERVER_IP_ADDR` and `TCP_SERVER_PORT` macros in the `tls_wolfssl.c` file to configure the host address and port. You will also need to define the server certificate. The example client uses the GET request to get a web resource from the server at https://google.com.
+You can modify the `TCP_SERVER_IP_ADDR` and `TCP_SERVER_PORT` macros
+in the `tls_wolfssl.c` file to configure the host address and
+port. You will also need to define the server certificate. The example
+client uses the GET request to get a web resource from the server at
+https://google.com.
 
 ### `wolfssl_server_test()`
 
-You can modify the `TLS_SERVER_PORT` in the `tls_wolfssl.c` file to configure the port number to listen on a local-host.
-Once you start the TLS server and `Listening for client connection` displays on the serial console, the server is ready to accept client connections.
+You can modify the `TLS_SERVER_PORT` in the `tls_wolfssl.c` file to
+configure the port number to listen on a local-host.  Once you start
+the TLS server and `Listening for client connection` displays on the
+serial console, the server is ready to accept client connections.
+
+You can connect to the server using the wolfssl TLS client example
+from your Linux or Windows host as follows:
 
-You can connect to the server using the wolfssl TLS client example from your Linux or Windows host as follows:
 ```
 $ ./examples/client/client.exe -h TLS_SERVER_IP_ADDRESS
 
@@ -218,8 +250,10 @@ I hear ya fa shizzle!
 
 ## References
 
-The test results were collected from the qemu-x86 reference platform target with the following software and tool chains:
-- OpenArbor, eclipse based IDE, toolVersion = "3.31.0"
+The following software and tool chains were used for testing:
+
+- OpenArbor 7.0.0
 - wolfssl [latest version](https://github.com/wolfSSL/wolfssl)
 
-For more information or questions, please email [support@wolfssl.com](mailto:support@wolfssl.com)
+For more information or questions, please email
+[support@wolfssl.com](mailto:support@wolfssl.com)

IDE/ECLIPSE/DEOS/deos_malloc.c

@@ -1,6 +1,6 @@
 /* deos_malloc.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -19,27 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 #include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/ssl.h>
-
-#define ROUND_UP(x, align)  (((int) (x) + (align - 1)) & ~(align - 1))
-#define SIZEOF_HEADER sizeof(size_t)  /* tracks size of allocated block */
-
-#define HEAP_SIZE_MAX   (1*1024*1024)
-
-static size_t allocatedMemory = 0;
-
-size_t getMemAllocatedSize_deos(size_t* size){
-
-    if (size)
-        *size = allocatedMemory;
-
-    return allocatedMemory;
-}
-
-/* Simply returns without freeing any memory. */
+#include <wolfssl/wolfcrypt/types.h>
+#include <deos.h>
 
 void free_deos(void *ptr) {
-    //printf("fake free_deos()\n");
+    free(ptr);
     return;
 }
 
@@ -51,10 +35,6 @@ void *realloc_deos(void *ptr, size_t size) {
     newptr = malloc_deos(size);
 
     if (ptr != NULL && newptr != NULL) {
-
-        if ( *((char *)ptr - SIZEOF_HEADER) < *((char *)newptr - SIZEOF_HEADER))
-            size = *((char *)ptr - SIZEOF_HEADER);
-
         XMEMCPY((char *) newptr, (const char *) ptr, size);
         free_deos(ptr);
     }
@@ -63,46 +43,5 @@ void *realloc_deos(void *ptr, size_t size) {
 }
 
 void *malloc_deos(size_t size) {
-    PDEOS_SYSTEM_INFO systemInfoPtr;
-    static VirtualAddressTYP heapAddr = NULL;
-    static VirtualAddressTYP freeAddr = NULL;
-    VirtualAddressTYP retAddr = NULL;
-    DWORD allocationSize = 0;
-    static int initialized = 0;
-
-    if (size <= 0)
-        return NULL;
-
-    if (!initialized) {
-        systemInfoPtr = (PDEOS_SYSTEM_INFO)getSystemInfoDEOS();
-        freeAddr = (VirtualAddressTYP)getNextLibraryStartAddress();
-        allocationSize = (((HEAP_SIZE_MAX - 1) / systemInfoPtr->dwPageSize) + 1) *
-                         systemInfoPtr->dwPageSize;
-
-        if (virtualAllocDEOS(freeAddr, allocationSize) != allocSuccess){
-            printf("ERROR: virtualAllocDEOS failed\n");
-            return NULL;
-        }
-
-        setNextLibraryStartAddress(freeAddr + allocationSize);
-        heapAddr = freeAddr;
-
-        initialized = 1;
-    }
-
-    size = ROUND_UP(size, sizeof(size_t));
-
-    if ((size + SIZEOF_HEADER) > (HEAP_SIZE_MAX - (freeAddr - heapAddr))){
-        printf("ERROR: malloc_deos cannot allocate from heap memory anymore\n");
-        return NULL;
-    }
-
-    *freeAddr = size;
-    freeAddr += SIZEOF_HEADER;
-    retAddr = freeAddr;
-    XMEMSET(retAddr, 0, size);
-    freeAddr += size;
-    allocatedMemory += size;
-
-    return retAddr;
+  return malloc(size);
 }

IDE/ECLIPSE/DEOS/deos_wolfssl/.cproject

@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="org.eclipse.cdt.core.default.config.472844465">
+			<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="org.eclipse.cdt.core.default.config.472844465" moduleId="org.eclipse.cdt.core.settings" name="Configuration">
+				<externalSettings/>
+				<extensions/>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry">
+		<pathentry base-path="C:/DDC-I/desk/ppc/include" include="./" kind="inc" path="" system="true"/>
+		<pathentry base-path="C:/DDC-I/desk/include" include="./" kind="inc" path="" system="true"/>
+		<pathentry base-path="C:/" include="./" kind="inc" path="" system="true"/>
+		<pathentry kind="mac" name="DIAGNOSTIC" path="" value=""/>
+		<pathentry kind="mac" name="WOLFSSL_USER_SETTINGS" path="" value=""/>
+		<pathentry kind="mac" name="__OpenArbor_editor" path="" value=""/>
+		<pathentry kind="mac" name="__DBL_MIN_EXP__" path="" value="(-1021)"/>
+		<pathentry kind="mac" name="__FLT32X_MAX_EXP__" path="" value="1024"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvmsubmsp" path="" value="__builtin_vsx_xvmsubsp"/>
+		<pathentry kind="mac" name="__UINT_LEAST16_MAX__" path="" value="0xffff"/>
+		<pathentry kind="mac" name="__ATOMIC_ACQUIRE" path="" value="2"/>
+		<pathentry kind="mac" name="__FLT_MIN__" path="" value="1.1754943508222875e-38F"/>
+		<pathentry kind="mac" name="__GCC_IEC_559_COMPLEX" path="" value="2"/>
+		<pathentry kind="mac" name="__UINT_LEAST8_TYPE__" path="" value="unsigned char"/>
+		<pathentry kind="mac" name="__INTMAX_C(c)" path="" value="c ## LL"/>
+		<pathentry kind="mac" name="__CHAR_BIT__" path="" value="8"/>
+		<pathentry kind="mac" name="__UINT8_MAX__" path="" value="0xff"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvnmaddadp" path="" value="__builtin_vsx_xvnmadddp"/>
+		<pathentry kind="mac" name="__WINT_MAX__" path="" value="0xffffffffU"/>
+		<pathentry kind="mac" name="__FLT32_MIN_EXP__" path="" value="(-125)"/>
+		<pathentry kind="mac" name="__builtin_vsx_xxlnor" path="" value="__builtin_vec_nor"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvnmsubmdp" path="" value="__builtin_vsx_xvnmsubdp"/>
+		<pathentry kind="mac" name="__ORDER_LITTLE_ENDIAN__" path="" value="1234"/>
+		<pathentry kind="mac" name="__SIZE_MAX__" path="" value="0xffffffffU"/>
+		<pathentry kind="mac" name="__WCHAR_MAX__" path="" value="0x7fffffffL"/>
+		<pathentry kind="mac" name="__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1" path="" value="1"/>
+		<pathentry kind="mac" name="__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2" path="" value="1"/>
+		<pathentry kind="mac" name="__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4" path="" value="1"/>
+		<pathentry kind="mac" name="__DBL_DENORM_MIN__" path="" value="((double)4.9406564584124654e-324L)"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_CHAR_LOCK_FREE" path="" value="2"/>
+		<pathentry kind="mac" name="__GCC_IEC_559" path="" value="2"/>
+		<pathentry kind="mac" name="__FLT32X_DECIMAL_DIG__" path="" value="17"/>
+		<pathentry kind="mac" name="__FLT_EVAL_METHOD__" path="" value="0"/>
+		<pathentry kind="mac" name="__unix__" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT64_DECIMAL_DIG__" path="" value="17"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_CHAR32_T_LOCK_FREE" path="" value="2"/>
+		<pathentry kind="mac" name="pixel" path="" value="pixel"/>
+		<pathentry kind="mac" name="bool" path="" value="bool"/>
+		<pathentry kind="mac" name="__UINT_FAST64_MAX__" path="" value="0xffffffffffffffffULL"/>
+		<pathentry kind="mac" name="__SIG_ATOMIC_TYPE__" path="" value="int"/>
+		<pathentry kind="mac" name="__DBL_MIN_10_EXP__" path="" value="(-307)"/>
+		<pathentry kind="mac" name="__FINITE_MATH_ONLY__" path="" value="0"/>
+		<pathentry kind="mac" name="__GNUC_PATCHLEVEL__" path="" value="0"/>
+		<pathentry kind="mac" name="__FLT32_HAS_DENORM__" path="" value="1"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvnmaddasp" path="" value="__builtin_vsx_xvnmaddsp"/>
+		<pathentry kind="mac" name="__UINT_FAST8_MAX__" path="" value="0xffffffffU"/>
+		<pathentry kind="mac" name="__has_include(STR)" path="" value="__has_include__(STR)"/>
+		<pathentry kind="mac" name="__DEC64_MAX_EXP__" path="" value="385"/>
+		<pathentry kind="mac" name="__INT8_C(c)" path="" value="c"/>
+		<pathentry kind="mac" name="__INT_LEAST8_WIDTH__" path="" value="8"/>
+		<pathentry kind="mac" name="__UINT_LEAST64_MAX__" path="" value="0xffffffffffffffffULL"/>
+		<pathentry kind="mac" name="__SHRT_MAX__" path="" value="0x7fff"/>
+		<pathentry kind="mac" name="__LDBL_MAX__" path="" value="1.7976931348623157e+308L"/>
+		<pathentry kind="mac" name="__UINT_LEAST8_MAX__" path="" value="0xff"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_BOOL_LOCK_FREE" path="" value="2"/>
+		<pathentry kind="mac" name="_ARCH_PPC" path="" value="1"/>
+		<pathentry kind="mac" name="__UINTMAX_TYPE__" path="" value="long long unsigned int"/>
+		<pathentry kind="mac" name="__DEC32_EPSILON__" path="" value="1E-6DF"/>
+		<pathentry kind="mac" name="__FLT_EVAL_METHOD_TS_18661_3__" path="" value="0"/>
+		<pathentry kind="mac" name="__CHAR_UNSIGNED__" path="" value="1"/>
+		<pathentry kind="mac" name="__UINT32_MAX__" path="" value="0xffffffffUL"/>
+		<pathentry kind="mac" name="__LDBL_MAX_EXP__" path="" value="1024"/>
+		<pathentry kind="mac" name="__WINT_MIN__" path="" value="0U"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvmaddmdp" path="" value="__builtin_vsx_xvmadddp"/>
+		<pathentry kind="mac" name="__builtin_vsx_vperm" path="" value="__builtin_vec_perm"/>
+		<pathentry kind="mac" name="__INT_LEAST16_WIDTH__" path="" value="16"/>
+		<pathentry kind="mac" name="__SCHAR_MAX__" path="" value="0x7f"/>
+		<pathentry kind="mac" name="__WCHAR_MIN__" path="" value="(-__WCHAR_MAX__ - 1)"/>
+		<pathentry kind="mac" name="vector" path="" value="vector"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvnmsubmsp" path="" value="__builtin_vsx_xvnmsubsp"/>
+		<pathentry kind="mac" name="__INT64_C(c)" path="" value="c ## LL"/>
+		<pathentry kind="mac" name="__DBL_DIG__" path="" value="15"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_POINTER_LOCK_FREE" path="" value="2"/>
+		<pathentry kind="mac" name="__SIZEOF_INT__" path="" value="4"/>
+		<pathentry kind="mac" name="__SIZEOF_POINTER__" path="" value="4"/>
+		<pathentry kind="mac" name="__USER_LABEL_PREFIX__" path="" value=""/>
+		<pathentry kind="mac" name="__STDC_HOSTED__" path="" value="1"/>
+		<pathentry kind="mac" name="__LDBL_HAS_INFINITY__" path="" value="1"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvmaddmsp" path="" value="__builtin_vsx_xvmaddsp"/>
+		<pathentry kind="mac" name="__FLT32_DIG__" path="" value="6"/>
+		<pathentry kind="mac" name="__FLT_EPSILON__" path="" value="1.1920928955078125e-7F"/>
+		<pathentry kind="mac" name="__SHRT_WIDTH__" path="" value="16"/>
+		<pathentry kind="mac" name="_CALL_SYSV" path="" value="1"/>
+		<pathentry kind="mac" name="__LDBL_MIN__" path="" value="2.2250738585072014e-308L"/>
+		<pathentry kind="mac" name="__STDC_UTF_16__" path="" value="1"/>
+		<pathentry kind="mac" name="__DEC32_MAX__" path="" value="9.999999E96DF"/>
+		<pathentry kind="mac" name="__FLT32X_HAS_INFINITY__" path="" value="1"/>
+		<pathentry kind="mac" name="__INT32_MAX__" path="" value="0x7fffffffL"/>
+		<pathentry kind="mac" name="__INT_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__SIZEOF_LONG__" path="" value="4"/>
+		<pathentry kind="mac" name="__UINT16_C(c)" path="" value="c"/>
+		<pathentry kind="mac" name="__PTRDIFF_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__DECIMAL_DIG__" path="" value="17"/>
+		<pathentry kind="mac" name="__FLT64_EPSILON__" path="" value="2.2204460492503131e-16F64"/>
+		<pathentry kind="mac" name="__INTMAX_WIDTH__" path="" value="64"/>
+		<pathentry kind="mac" name="__has_include_next(STR)" path="" value="__has_include_next__(STR)"/>
+		<pathentry kind="mac" name="__LDBL_HAS_QUIET_NAN__" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT64_MANT_DIG__" path="" value="53"/>
+		<pathentry kind="mac" name="__GNUC__" path="" value="7"/>
+		<pathentry kind="mac" name="__FLT_HAS_DENORM__" path="" value="1"/>
+		<pathentry kind="mac" name="__SIZEOF_LONG_DOUBLE__" path="" value="8"/>
+		<pathentry kind="mac" name="__BIGGEST_ALIGNMENT__" path="" value="16"/>
+		<pathentry kind="mac" name="__FLT64_MAX_10_EXP__" path="" value="308"/>
+		<pathentry kind="mac" name="__DBL_MAX__" path="" value="((double)1.7976931348623157e+308L)"/>
+		<pathentry kind="mac" name="__INT_FAST32_MAX__" path="" value="0x7fffffff"/>
+		<pathentry kind="mac" name="__DBL_HAS_INFINITY__" path="" value="1"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvnmaddmdp" path="" value="__builtin_vsx_xvnmadddp"/>
+		<pathentry kind="mac" name="__DEC32_MIN_EXP__" path="" value="(-94)"/>
+		<pathentry kind="mac" name="__builtin_vsx_xxlandc" path="" value="__builtin_vec_andc"/>
+		<pathentry kind="mac" name="__INTPTR_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__FLT32X_HAS_DENORM__" path="" value="1"/>
+		<pathentry kind="mac" name="__INT_FAST16_TYPE__" path="" value="int"/>
+		<pathentry kind="mac" name="__LDBL_HAS_DENORM__" path="" value="1"/>
+		<pathentry kind="mac" name="__DEC128_MAX__" path="" value="9.999999999999999999999999999999999E6144DL"/>
+		<pathentry kind="mac" name="__INT_LEAST32_MAX__" path="" value="0x7fffffffL"/>
+		<pathentry kind="mac" name="__DEC32_MIN__" path="" value="1E-95DF"/>
+		<pathentry kind="mac" name="__DBL_MAX_EXP__" path="" value="1024"/>
+		<pathentry kind="mac" name="__WCHAR_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__FLT32_MAX__" path="" value="3.4028234663852886e+38F32"/>
+		<pathentry kind="mac" name="__DEC128_EPSILON__" path="" value="1E-33DL"/>
+		<pathentry kind="mac" name="__PTRDIFF_MAX__" path="" value="0x7fffffff"/>
+		<pathentry kind="mac" name="__FLT32_HAS_QUIET_NAN__" path="" value="1"/>
+		<pathentry kind="mac" name="__LONG_LONG_MAX__" path="" value="0x7fffffffffffffffLL"/>
+		<pathentry kind="mac" name="__SIZEOF_SIZE_T__" path="" value="4"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvnmaddmsp" path="" value="__builtin_vsx_xvnmaddsp"/>
+		<pathentry kind="mac" name="__PPC__" path="" value="1"/>
+		<pathentry kind="mac" name="__SIZEOF_WINT_T__" path="" value="4"/>
+		<pathentry kind="mac" name="__LONG_LONG_WIDTH__" path="" value="64"/>
+		<pathentry kind="mac" name="__FLT32_MAX_EXP__" path="" value="128"/>
+		<pathentry kind="mac" name="__GXX_ABI_VERSION" path="" value="1011"/>
+		<pathentry kind="mac" name="__FLT_MIN_EXP__" path="" value="(-125)"/>
+		<pathentry kind="mac" name="__INT_FAST64_TYPE__" path="" value="long long int"/>
+		<pathentry kind="mac" name="__FP_FAST_FMAF" path="" value="1"/>
+		<pathentry kind="mac" name="__FP_FAST_FMAL" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT64_DENORM_MIN__" path="" value="4.9406564584124654e-324F64"/>
+		<pathentry kind="mac" name="__DBL_MIN__" path="" value="((double)2.2250738585072014e-308L)"/>
+		<pathentry kind="mac" name="__FLT32X_EPSILON__" path="" value="2.2204460492503131e-16F32x"/>
+		<pathentry kind="mac" name="__FLT64_MIN_EXP__" path="" value="(-1021)"/>
+		<pathentry kind="mac" name="__FLT64_MIN_10_EXP__" path="" value="(-307)"/>
+		<pathentry kind="mac" name="__DEC128_MIN__" path="" value="1E-6143DL"/>
+		<pathentry kind="mac" name="__REGISTER_PREFIX__" path="" value=""/>
+		<pathentry kind="mac" name="__UINT16_MAX__" path="" value="0xffff"/>
+		<pathentry kind="mac" name="__DBL_HAS_DENORM__" path="" value="1"/>
+		<pathentry kind="mac" name="__builtin_vsx_xxland" path="" value="__builtin_vec_and"/>
+		<pathentry kind="mac" name="__FLT32_MIN__" path="" value="1.1754943508222875e-38F32"/>
+		<pathentry kind="mac" name="__UINT8_TYPE__" path="" value="unsigned char"/>
+		<pathentry kind="mac" name="__NO_INLINE__" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT_MANT_DIG__" path="" value="24"/>
+		<pathentry kind="mac" name="__LDBL_DECIMAL_DIG__" path="" value="17"/>
+		<pathentry kind="mac" name="__VERSION__" path="" value="&quot;7.3.0&quot;"/>
+		<pathentry kind="mac" name="__UINT64_C(c)" path="" value="c ## ULL"/>
+		<pathentry kind="mac" name="__BIG_ENDIAN__" path="" value="1"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_INT_LOCK_FREE" path="" value="2"/>
+		<pathentry kind="mac" name="__pixel" path="" value="__attribute__((altivec(pixel__))) unsigned short"/>
+		<pathentry kind="mac" name="__FLT32_MANT_DIG__" path="" value="24"/>
+		<pathentry kind="mac" name="__FLOAT_WORD_ORDER__" path="" value="__ORDER_BIG_ENDIAN__"/>
+		<pathentry kind="mac" name="__SCHAR_WIDTH__" path="" value="8"/>
+		<pathentry kind="mac" name="__INT32_C(c)" path="" value="c ## L"/>
+		<pathentry kind="mac" name="__DEC64_EPSILON__" path="" value="1E-15DD"/>
+		<pathentry kind="mac" name="__ORDER_PDP_ENDIAN__" path="" value="3412"/>
+		<pathentry kind="mac" name="__DEC128_MIN_EXP__" path="" value="(-6142)"/>
+		<pathentry kind="mac" name="__FLT32_MAX_10_EXP__" path="" value="38"/>
+		<pathentry kind="mac" name="__INT_FAST32_TYPE__" path="" value="int"/>
+		<pathentry kind="mac" name="__UINT_LEAST16_TYPE__" path="" value="short unsigned int"/>
+		<pathentry kind="mac" name="unix" path="" value="1"/>
+		<pathentry kind="mac" name="__INT16_MAX__" path="" value="0x7fff"/>
+		<pathentry kind="mac" name="__SIZE_TYPE__" path="" value="unsigned int"/>
+		<pathentry kind="mac" name="__UINT64_MAX__" path="" value="0xffffffffffffffffULL"/>
+		<pathentry kind="mac" name="__INT8_TYPE__" path="" value="signed char"/>
+		<pathentry kind="mac" name="__ELF__" path="" value="1"/>
+		<pathentry kind="mac" name="__HAVE_BSWAP__" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT_RADIX__" path="" value="2"/>
+		<pathentry kind="mac" name="__INT_LEAST16_TYPE__" path="" value="short int"/>
+		<pathentry kind="mac" name="__LDBL_EPSILON__" path="" value="2.2204460492503131e-16L"/>
+		<pathentry kind="mac" name="__UINTMAX_C(c)" path="" value="c ## ULL"/>
+		<pathentry kind="mac" name="__SIG_ATOMIC_MAX__" path="" value="0x7fffffff"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_WCHAR_T_LOCK_FREE" path="" value="2"/>
+		<pathentry kind="mac" name="__SIZEOF_PTRDIFF_T__" path="" value="4"/>
+		<pathentry kind="mac" name="__FLT32X_MANT_DIG__" path="" value="53"/>
+		<pathentry kind="mac" name="__FLT32X_MIN_EXP__" path="" value="(-1021)"/>
+		<pathentry kind="mac" name="__DEC32_SUBNORMAL_MIN__" path="" value="0.000001E-95DF"/>
+		<pathentry kind="mac" name="__INT_FAST16_MAX__" path="" value="0x7fffffff"/>
+		<pathentry kind="mac" name="__vector" path="" value="__attribute__((altivec(vector__)))"/>
+		<pathentry kind="mac" name="__FLT64_DIG__" path="" value="15"/>
+		<pathentry kind="mac" name="__UINT_FAST32_MAX__" path="" value="0xffffffffU"/>
+		<pathentry kind="mac" name="__UINT_LEAST64_TYPE__" path="" value="long long unsigned int"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvmsubadp" path="" value="__builtin_vsx_xvmsubdp"/>
+		<pathentry kind="mac" name="__builtin_vsx_xxsel" path="" value="__builtin_vec_sel"/>
+		<pathentry kind="mac" name="__FLT_HAS_QUIET_NAN__" path="" value="1"/>
+		<pathentry kind="mac" name="__bool" path="" value="__attribute__((altivec(bool__))) unsigned"/>
+		<pathentry kind="mac" name="__FLT_MAX_10_EXP__" path="" value="38"/>
+		<pathentry kind="mac" name="__LONG_MAX__" path="" value="0x7fffffffL"/>
+		<pathentry kind="mac" name="__DEC128_SUBNORMAL_MIN__" path="" value="0.000000000000000000000000000000001E-6143DL"/>
+		<pathentry kind="mac" name="__FLT_HAS_INFINITY__" path="" value="1"/>
+		<pathentry kind="mac" name="__unix" path="" value="1"/>
+		<pathentry kind="mac" name="__UINT_FAST16_TYPE__" path="" value="unsigned int"/>
+		<pathentry kind="mac" name="__DEC64_MAX__" path="" value="9.999999999999999E384DD"/>
+		<pathentry kind="mac" name="__INT_FAST32_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__CHAR16_TYPE__" path="" value="short unsigned int"/>
+		<pathentry kind="mac" name="__PRAGMA_REDEFINE_EXTNAME" path="" value="1"/>
+		<pathentry kind="mac" name="__SIZE_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__INT_LEAST16_MAX__" path="" value="0x7fff"/>
+		<pathentry kind="mac" name="__DEC64_MANT_DIG__" path="" value="16"/>
+		<pathentry kind="mac" name="__INT64_MAX__" path="" value="0x7fffffffffffffffLL"/>
+		<pathentry kind="mac" name="__UINT_LEAST32_MAX__" path="" value="0xffffffffUL"/>
+		<pathentry kind="mac" name="__FLT32_DENORM_MIN__" path="" value="1.4012984643248171e-45F32"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_LONG_LOCK_FREE" path="" value="2"/>
+		<pathentry kind="mac" name="__SIG_ATOMIC_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__INT_LEAST64_TYPE__" path="" value="long long int"/>
+		<pathentry kind="mac" name="__INT16_TYPE__" path="" value="short int"/>
+		<pathentry kind="mac" name="__INT_LEAST8_TYPE__" path="" value="signed char"/>
+		<pathentry kind="mac" name="__STDC_VERSION__" path="" value="201112L"/>
+		<pathentry kind="mac" name="__DEC32_MAX_EXP__" path="" value="97"/>
+		<pathentry kind="mac" name="_BIG_ENDIAN" path="" value="1"/>
+		<pathentry kind="mac" name="__INT_FAST8_MAX__" path="" value="0x7fffffff"/>
+		<pathentry kind="mac" name="__INTPTR_MAX__" path="" value="0x7fffffff"/>
+		<pathentry kind="mac" name="__FLT64_HAS_QUIET_NAN__" path="" value="1"/>
+		<pathentry kind="mac" name="__PPC" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT32_MIN_10_EXP__" path="" value="(-37)"/>
+		<pathentry kind="mac" name="__FLT32X_DIG__" path="" value="15"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvmsubasp" path="" value="__builtin_vsx_xvmsubsp"/>
+		<pathentry kind="mac" name="__LDBL_MANT_DIG__" path="" value="53"/>
+		<pathentry kind="mac" name="__svr4__" path="" value="1"/>
+		<pathentry kind="mac" name="__DBL_HAS_QUIET_NAN__" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT64_HAS_INFINITY__" path="" value="1"/>
+		<pathentry kind="mac" name="__SIG_ATOMIC_MIN__" path="" value="(-__SIG_ATOMIC_MAX__ - 1)"/>
+		<pathentry kind="mac" name="__INTPTR_TYPE__" path="" value="int"/>
+		<pathentry kind="mac" name="__UINT16_TYPE__" path="" value="short unsigned int"/>
+		<pathentry kind="mac" name="__WCHAR_TYPE__" path="" value="long int"/>
+		<pathentry kind="mac" name="__SIZEOF_FLOAT__" path="" value="4"/>
+		<pathentry kind="mac" name="__UINTPTR_MAX__" path="" value="0xffffffffU"/>
+		<pathentry kind="mac" name="__INT_FAST64_WIDTH__" path="" value="64"/>
+		<pathentry kind="mac" name="__DEC64_MIN_EXP__" path="" value="(-382)"/>
+		<pathentry kind="mac" name="__FLT32_DECIMAL_DIG__" path="" value="9"/>
+		<pathentry kind="mac" name="__INT_FAST64_MAX__" path="" value="0x7fffffffffffffffLL"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_TEST_AND_SET_TRUEVAL" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT_DIG__" path="" value="6"/>
+		<pathentry kind="mac" name="__FLT32_HAS_INFINITY__" path="" value="1"/>
+		<pathentry kind="mac" name="__UINT_FAST64_TYPE__" path="" value="long long unsigned int"/>
+		<pathentry kind="mac" name="__INT_MAX__" path="" value="0x7fffffff"/>
+		<pathentry kind="mac" name="__INT64_TYPE__" path="" value="long long int"/>
+		<pathentry kind="mac" name="__FLT_MAX_EXP__" path="" value="128"/>
+		<pathentry kind="mac" name="__builtin_vsx_xxlor" path="" value="__builtin_vec_or"/>
+		<pathentry kind="mac" name="__DBL_MANT_DIG__" path="" value="53"/>
+		<pathentry kind="mac" name="__INT_LEAST64_MAX__" path="" value="0x7fffffffffffffffLL"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_CHAR16_T_LOCK_FREE" path="" value="2"/>
+		<pathentry kind="mac" name="__builtin_vsx_xxlxor" path="" value="__builtin_vec_xor"/>
+		<pathentry kind="mac" name="__DEC64_MIN__" path="" value="1E-383DD"/>
+		<pathentry kind="mac" name="__WINT_TYPE__" path="" value="unsigned int"/>
+		<pathentry kind="mac" name="__UINT_LEAST32_TYPE__" path="" value="long unsigned int"/>
+		<pathentry kind="mac" name="__SIZEOF_SHORT__" path="" value="2"/>
+		<pathentry kind="mac" name="__LDBL_MIN_EXP__" path="" value="(-1021)"/>
+		<pathentry kind="mac" name="__FLT64_MAX__" path="" value="1.7976931348623157e+308F64"/>
+		<pathentry kind="mac" name="__WINT_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__INT_LEAST8_MAX__" path="" value="0x7f"/>
+		<pathentry kind="mac" name="__FLT32X_MAX_10_EXP__" path="" value="308"/>
+		<pathentry kind="mac" name="__LDBL_MAX_10_EXP__" path="" value="308"/>
+		<pathentry kind="mac" name="__ATOMIC_RELAXED" path="" value="0"/>
+		<pathentry kind="mac" name="__DBL_EPSILON__" path="" value="((double)2.2204460492503131e-16L)"/>
+		<pathentry kind="mac" name="__UINT8_C(c)" path="" value="c"/>
+		<pathentry kind="mac" name="PPC" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT64_MAX_EXP__" path="" value="1024"/>
+		<pathentry kind="mac" name="__INT_LEAST32_TYPE__" path="" value="long int"/>
+		<pathentry kind="mac" name="__SIZEOF_WCHAR_T__" path="" value="4"/>
+		<pathentry kind="mac" name="__UINT64_TYPE__" path="" value="long long unsigned int"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvnmsubadp" path="" value="__builtin_vsx_xvnmsubdp"/>
+		<pathentry kind="mac" name="__INT_FAST8_TYPE__" path="" value="int"/>
+		<pathentry kind="mac" name="__GNUC_STDC_INLINE__" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT64_HAS_DENORM__" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT32_EPSILON__" path="" value="1.1920928955078125e-7F32"/>
+		<pathentry kind="mac" name="__DBL_DECIMAL_DIG__" path="" value="17"/>
+		<pathentry kind="mac" name="__STDC_UTF_32__" path="" value="1"/>
+		<pathentry kind="mac" name="__INT_FAST8_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__DEC_EVAL_METHOD__" path="" value="2"/>
+		<pathentry kind="mac" name="__FLT32X_MAX__" path="" value="1.7976931348623157e+308F32x"/>
+		<pathentry kind="mac" name="__VEC_ELEMENT_REG_ORDER__" path="" value="__ORDER_BIG_ENDIAN__"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvmaddadp" path="" value="__builtin_vsx_xvmadddp"/>
+		<pathentry kind="mac" name="__ORDER_BIG_ENDIAN__" path="" value="4321"/>
+		<pathentry kind="mac" name="__UINT32_C(c)" path="" value="c ## UL"/>
+		<pathentry kind="mac" name="__INTMAX_MAX__" path="" value="0x7fffffffffffffffLL"/>
+		<pathentry kind="mac" name="__BYTE_ORDER__" path="" value="__ORDER_BIG_ENDIAN__"/>
+		<pathentry kind="mac" name="__FLT_DENORM_MIN__" path="" value="1.4012984643248171e-45F"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvnmsubasp" path="" value="__builtin_vsx_xvnmsubsp"/>
+		<pathentry kind="mac" name="__INT8_MAX__" path="" value="0x7f"/>
+		<pathentry kind="mac" name="__LONG_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__UINT_FAST32_TYPE__" path="" value="unsigned int"/>
+		<pathentry kind="mac" name="__CHAR32_TYPE__" path="" value="long unsigned int"/>
+		<pathentry kind="mac" name="__FLT_MAX__" path="" value="3.4028234663852886e+38F"/>
+		<pathentry kind="mac" name="__FP_FAST_FMA" path="" value="1"/>
+		<pathentry kind="mac" name="__INT32_TYPE__" path="" value="long int"/>
+		<pathentry kind="mac" name="__SIZEOF_DOUBLE__" path="" value="8"/>
+		<pathentry kind="mac" name="__FLT_MIN_10_EXP__" path="" value="(-37)"/>
+		<pathentry kind="mac" name="__FLT64_MIN__" path="" value="2.2250738585072014e-308F64"/>
+		<pathentry kind="mac" name="__INT_LEAST32_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__INTMAX_TYPE__" path="" value="long long int"/>
+		<pathentry kind="mac" name="__DEC128_MAX_EXP__" path="" value="6145"/>
+		<pathentry kind="mac" name="__FLT32X_HAS_QUIET_NAN__" path="" value="1"/>
+		<pathentry kind="mac" name="__ATOMIC_CONSUME" path="" value="1"/>
+		<pathentry kind="mac" name="__GNUC_MINOR__" path="" value="3"/>
+		<pathentry kind="mac" name="__INT_FAST16_WIDTH__" path="" value="32"/>
+		<pathentry kind="mac" name="__UINTMAX_MAX__" path="" value="0xffffffffffffffffULL"/>
+		<pathentry kind="mac" name="__DEC32_MANT_DIG__" path="" value="7"/>
+		<pathentry kind="mac" name="__FLT32X_DENORM_MIN__" path="" value="4.9406564584124654e-324F32x"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvmaddasp" path="" value="__builtin_vsx_xvmaddsp"/>
+		<pathentry kind="mac" name="__DBL_MAX_10_EXP__" path="" value="308"/>
+		<pathentry kind="mac" name="__LDBL_DENORM_MIN__" path="" value="4.9406564584124654e-324L"/>
+		<pathentry kind="mac" name="__INT16_C(c)" path="" value="c"/>
+		<pathentry kind="mac" name="__STDC__" path="" value="1"/>
+		<pathentry kind="mac" name="__builtin_vsx_xvmsubmdp" path="" value="__builtin_vsx_xvmsubdp"/>
+		<pathentry kind="mac" name="__PTRDIFF_TYPE__" path="" value="int"/>
+		<pathentry kind="mac" name="__ATOMIC_SEQ_CST" path="" value="5"/>
+		<pathentry kind="mac" name="__UINT32_TYPE__" path="" value="long unsigned int"/>
+		<pathentry kind="mac" name="__FLT32X_MIN_10_EXP__" path="" value="(-307)"/>
+		<pathentry kind="mac" name="__UINTPTR_TYPE__" path="" value="unsigned int"/>
+		<pathentry kind="mac" name="__DEC64_SUBNORMAL_MIN__" path="" value="0.000000000000001E-383DD"/>
+		<pathentry kind="mac" name="__DEC128_MANT_DIG__" path="" value="34"/>
+		<pathentry kind="mac" name="__LDBL_MIN_10_EXP__" path="" value="(-307)"/>
+		<pathentry kind="mac" name="__SIZEOF_LONG_LONG__" path="" value="8"/>
+		<pathentry kind="mac" name="_Bool" path="" value="_Bool"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_LLONG_LOCK_FREE" path="" value="1"/>
+		<pathentry kind="mac" name="__FLT32X_MIN__" path="" value="2.2250738585072014e-308F32x"/>
+		<pathentry kind="mac" name="__LDBL_DIG__" path="" value="15"/>
+		<pathentry kind="mac" name="__FLT_DECIMAL_DIG__" path="" value="9"/>
+		<pathentry kind="mac" name="__UINT_FAST16_MAX__" path="" value="0xffffffffU"/>
+		<pathentry kind="mac" name="__GCC_ATOMIC_SHORT_LOCK_FREE" path="" value="2"/>
+		<pathentry kind="mac" name="__INT_LEAST64_WIDTH__" path="" value="64"/>
+		<pathentry kind="mac" name="__UINT_FAST8_TYPE__" path="" value="unsigned int"/>
+		<pathentry kind="mac" name="__ATOMIC_ACQ_REL" path="" value="4"/>
+		<pathentry kind="mac" name="__ATOMIC_RELEASE" path="" value="3"/>
+	</storageModule>
+</cproject>

IDE/ECLIPSE/DEOS/deos_wolfssl/.options

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://www.ddci.com/DEOS_SHARED_OBJECToptions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddci:/xsd/DEOS_SHARED_OBJECT.xsd http://www.ddci.com/DEOS_SHARED_OBJECToptions">
+  <version>26</version>
+  <targetArch>ppc</targetArch>
+  <variant>diagnostic</variant>
+  <depend>kernel</depend>
+  <depend variant="diagnostic">video</depend>
+  <depend>ansi</depend>
+  <depend>math</depend>
+  <depend>deos-time</depend>
+  <depend>sal</depend>
+  <depend>mtl</depend>
+  <depend>printx</depend>
+  <depend>gnu-language</depend>
+  <kernelFile kfs="hypstart">lib$(PROJECT_NAME).so</kernelFile>
+  <copyToAppbin>$(BINARY)</copyToAppbin>
+  <copyToAppbin>$(BINARY).dbg</copyToAppbin>
+  <gccCCompileDirectories targetArch="arm">$(DESK_DIR)/arm/include</gccCCompileDirectories>
+  <gccCCompileDirectories targetArch="ppc">$(DESK_DIR)/ppc/include</gccCCompileDirectories>
+  <gccCCompileDirectories targetArch="x86">$(DESK_DIR)/x86/include</gccCCompileDirectories>
+  <gccCCompileDirectories>$(DESK_DIR)/include</gccCCompileDirectories>
+  <gccCCompileDirectories>$(PROJECT_DIR)/../../../..</gccCCompileDirectories>
+  <gccCCompileDirectories>$(PROJECT_DIR)/../../../../fips</gccCCompileDirectories>
+  <gccCCompileDirectories>$(PROJECT_DIR)/..</gccCCompileDirectories>
+  <gccCCompileDirectories>$(PROJECT_DIR.printx)/code</gccCCompileDirectories>
+  <gccCCompileDefinedMacros>WOLFSSL_USER_SETTINGS</gccCCompileDefinedMacros>
+  <gccCppLinkDirectories targetArch="arm">$(DESK_DIR)/arm/appbin</gccCppLinkDirectories>
+  <gccCppLinkDirectories targetArch="ppc">$(DESK_DIR)/ppc/appbin</gccCppLinkDirectories>
+  <gccCppLinkDirectories targetArch="x86">$(DESK_DIR)/x86/appbin</gccCppLinkDirectories>
+  <gccCppLinkUseIntermediateArchive>true</gccCppLinkUseIntermediateArchive>
+  <gccCppLinkAdditionalOptions>-L $(PROJECT_DIR.printx)/output/powerpc-motorola-elf/diagnostic</gccCppLinkAdditionalOptions>
+  <fpuType>none</fpuType>
+  <ignore>fips.c</ignore>
+  <ignore>fips_test.c</ignore>
+  <ignore>selftest.c</ignore>
+</project>

IDE/ECLIPSE/DEOS/deos_wolfssl/.project

@@ -0,0 +1,634 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>wolfssl</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.ddci.common.ide.Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.ddci.common.ide.DdciNature</nature>
+		<nature>com.ddci.common.ide.ExecutableNature</nature>
+		<nature>com.ddci.deos.common.deosLoadListNature</nature>
+		<nature>com.ddci.common.ide.DEOS_SHARED_OBJECT</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>deos_malloc.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/IDE/ECLIPSE/DEOS/deos_malloc.c</locationURI>
+		</link>
+		<link>
+			<name>fips.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/fips/fips.c</locationURI>
+		</link>
+		<link>
+			<name>fips_test.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/fips/fips_test.c</locationURI>
+		</link>
+		<link>
+			<name>selftest.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/fips/selftest.c</locationURI>
+		</link>
+		<link>
+			<name>user_settings.h</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/IDE/ECLIPSE/DEOS/user_settings.h</locationURI>
+		</link>
+		<link>
+			<name>wolfssl</name>
+			<type>2</type>
+			<locationURI>WOLFSSL_ROOT/wolfssl</locationURI>
+		</link>
+		<link>
+			<name>src/crl.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/src/crl.c</locationURI>
+		</link>
+		<link>
+			<name>src/internal.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/src/internal.c</locationURI>
+		</link>
+		<link>
+			<name>src/keys.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/src/keys.c</locationURI>
+		</link>
+		<link>
+			<name>src/ocsp.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/src/ocsp.c</locationURI>
+		</link>
+		<link>
+			<name>src/sniffer.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/src/sniffer.c</locationURI>
+		</link>
+		<link>
+			<name>src/ssl.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/src/ssl.c</locationURI>
+		</link>
+		<link>
+			<name>src/tls.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/src/tls.c</locationURI>
+		</link>
+		<link>
+			<name>src/tls13.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/src/tls13.c</locationURI>
+		</link>
+		<link>
+			<name>src/wolfio.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/src/wolfio.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/benchmark</name>
+			<type>2</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/benchmark</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/test</name>
+			<type>2</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/test</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/aes.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/aes.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/arc4.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/arc4.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/asm.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/asm.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/asn.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/asn.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/blake2b.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/blake2b.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/blake2s.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/blake2s.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/camellia.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/camellia.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/chacha.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/chacha.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/chacha20_poly1305.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/chacha20_poly1305.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/cmac.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/cmac.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/coding.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/coding.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/compress.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/compress.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/cpuid.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/cpuid.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/cryptocb.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/cryptocb.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/curve25519.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/curve25519.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/curve448.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/curve448.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/des3.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/des3.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/dh.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/dh.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/dsa.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/dsa.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/ecc.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/ecc.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/ecc_fp.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/ecc_fp.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/ed25519.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/ed25519.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/ed448.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/ed448.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/error.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/error.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fe_448.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fe_448.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fe_low_mem.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fe_low_mem.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fe_operations.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fe_operations.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fe_x25519_128.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fe_x25519_128.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mont_small.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mont_small.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_12.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_12.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_17.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_17.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_20.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_20.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_24.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_24.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_28.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_28.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_3.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_3.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_32.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_32.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_4.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_4.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_48.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_48.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_6.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_6.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_64.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_64.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_7.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_7.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_8.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_8.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_9.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_9.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_mul_comba_small_set.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_mul_comba_small_set.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_12.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_12.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_17.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_17.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_20.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_20.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_24.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_24.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_28.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_28.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_3.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_3.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_32.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_32.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_4.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_4.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_48.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_48.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_6.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_6.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_64.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_64.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_7.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_7.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_8.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_8.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_9.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_9.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/fp_sqr_comba_small_set.i</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/fp_sqr_comba_small_set.i</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/ge_448.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/ge_448.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/ge_low_mem.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/ge_low_mem.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/ge_operations.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/ge_operations.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/kdf.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/kdf.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/hash.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/hash.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/hc128.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/hc128.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/hmac.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/hmac.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/idea.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/idea.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/integer.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/integer.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/logging.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/logging.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/md2.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/md2.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/md4.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/md4.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/md5.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/md5.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/memory.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/memory.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/pkcs12.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/pkcs12.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/pkcs7.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/pkcs7.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/poly1305.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/poly1305.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/pwdbased.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/pwdbased.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/rabbit.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/rabbit.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/random.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/random.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/rc2.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/rc2.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/ripemd.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/ripemd.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/rsa.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/rsa.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sha.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sha.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sha256.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sha256.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sha3.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sha3.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sha512.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sha512.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/signature.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/signature.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sp_arm32.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sp_arm32.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sp_arm64.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sp_arm64.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sp_armthumb.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sp_armthumb.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sp_c32.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sp_c32.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sp_c64.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sp_c64.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sp_cortexm.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sp_cortexm.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sp_dsp32.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sp_dsp32.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sp_int.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sp_int.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/sp_x86_64.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/sp_x86_64.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/srp.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/srp.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/tfm.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/tfm.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/wc_dsp.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/wc_dsp.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/wc_encrypt.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/wc_encrypt.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/wc_pkcs11.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/wc_pkcs11.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/wc_port.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/wc_port.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/wolfevent.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/wolfevent.c</locationURI>
+		</link>
+		<link>
+			<name>wolfcrypt/src/wolfmath.c</name>
+			<type>1</type>
+			<locationURI>WOLFSSL_ROOT/wolfcrypt/src/wolfmath.c</locationURI>
+		</link>
+	</linkedResources>
+	<variableList>
+		<variable>
+			<name>WOLFSSL_ROOT</name>
+			<value>$%7BPARENT-4-PROJECT_LOC%7D</value>
+		</variable>
+	</variableList>
+</projectDescription>

IDE/ECLIPSE/DEOS/include.am

@@ -7,4 +7,7 @@ EXTRA_DIST += \
     IDE/ECLIPSE/DEOS/user_settings.h \
     IDE/ECLIPSE/DEOS/tls_wolfssl.h \
     IDE/ECLIPSE/DEOS/tls_wolfssl.c \
-    IDE/ECLIPSE/DEOS/deos_malloc.c
+    IDE/ECLIPSE/DEOS/deos_malloc.c \
+    IDE/ECLIPSE/DEOS/deos_wolfssl/.cproject \
+    IDE/ECLIPSE/DEOS/deos_wolfssl/.options \
+    IDE/ECLIPSE/DEOS/deos_wolfssl/.project

IDE/ECLIPSE/DEOS/tls_wolfssl.c

@@ -1,6 +1,6 @@
 /* tls_wolfssl.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/ECLIPSE/DEOS/tls_wolfssl.h

@@ -1,6 +1,6 @@
 /* tls_wolfssl.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/ECLIPSE/DEOS/user_settings.h

@@ -1,6 +1,6 @@
 /* user_setting.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -65,6 +65,8 @@ You can get the current time from https://www.unixtimestamp.com/
 #define HAVE_ED25519
 #define ED25519_SMALL
 
+#define WOLFSSL_DTLS
+
 /* TLS 1.3 */
 #if 0
     #define WOLFSSL_TLS13
@@ -103,8 +105,6 @@ You can get the current time from https://www.unixtimestamp.com/
 
 #endif
 
-#define printf printx
-
 #ifdef __cplusplus
     }   /* extern "C" */
 #endif

IDE/ECLIPSE/MICRIUM/client_wolfssl.c

@@ -1,6 +1,6 @@
 /* client_wolfssl.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/ECLIPSE/MICRIUM/client_wolfssl.h

@@ -1,6 +1,6 @@
 /* client_wolfssl.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/ECLIPSE/MICRIUM/server_wolfssl.c

@@ -1,6 +1,6 @@
 /* server_wolfssl.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/ECLIPSE/MICRIUM/server_wolfssl.h

@@ -1,6 +1,6 @@
 /* server_wolfssl.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/ECLIPSE/MICRIUM/user_settings.h

@@ -1,6 +1,6 @@
 /* user_setting.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/ECLIPSE/MICRIUM/wolfsslRunTests.c

@@ -1,6 +1,6 @@
 /* wolfsslRunTests.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/ECLIPSE/RTTHREAD/user_settings.h

@@ -1,6 +1,6 @@
 /* user_setting.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/ECLIPSE/RTTHREAD/wolfssl_test.c

@@ -1,6 +1,6 @@
 /* wolfsslRunTests.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/Espressif/ESP-IDF/README.md

@@ -4,28 +4,33 @@
 
 Including the following examples:
 
-* simple tls_client/server
-* crypt test
-* crypt benchmark
+* Simple [tls_client](./examples/wolfssl_client/)/[server](./examples/wolfssl_server/)
+* Cryptographic [test](./examples/wolfssl_test/)
+* Cryptographic [benchmark](./examples/wolfssl_benchmark/)
 
  The *user_settings.h* file enables some of the hardened settings.
 
 ## Requirements
- 1. ESP-IDF development framework  
-    [https://docs.espressif.com/projects/esp-idf/en/latest/get-started/]
+ 1. [ESP-IDF development framework](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/)
 
     Note: This expects to use Linux version.
 
 ## Setup for Linux
- 1. Run *setup.sh* at /path/to/wolfssl/IDE/Espressif/ESP-IDF/ to deploy files into ESP-IDF tree  
-    For Windows : Run *setup_win.bat* at \IDE\Espressif\ESP-IDF\
- 2. Find Wolfssl files at /path/to/esp-idf/components/wolfssl/
- 3. Find Example programs under /path/to/esp-idf/examples/protocols/wolfssl_xxx
- 4. Uncomment out #define WOLFSSL_ESPIDF in /path/to/wolfssl/wolfssl/wolfcrypt/settings.h  
-    Uncomment out #define WOLFSSL_ESPWROOM32 in /path/to/wolfssl/wolfssl/wolfcrypt/settings.h
+ 1. Run `setup.sh` at _/path/to_`/wolfssl/IDE/Espressif/ESP-IDF/` to deploy files into ESP-IDF tree  
+    For Windows : Run `setup_win.bat` at `.\IDE\Espressif\ESP-IDF\`
+    
+ 2. Find Wolfssl files at _/path/to/esp_`/esp-idf/components/wolfssl/`
+ 
+ 3. Find [Example programs](https://github.com/wolfSSL/wolfssl/tree/master/IDE/Espressif/ESP-IDF/examples) under _/path/to/esp_`/esp-idf/examples/protocols/wolfssl_xxx` (where xxx is the project name)
+
+ 4. Uncomment out `#define WOLFSSL_ESPIDF` in _/path/to/esp_`/esp-idf/components/wolfssl/wolfssl/wolfcrypt/settings.h`  
+    Uncomment out `#define WOLFSSL_ESPWROOM32` in _/path/to/esp_`/esp-idf/components/wolfssl/wolfssl/wolfcrypt/settings.h`
+    
+    for example the default:
+    `~/esp/esp-idf/components/wolfssl/wolfssl/wolfcrypt/settings.h`
 
 ## Configuration
- 1. The *user_settings.h* can be found in /path/to/esp-idf/components/wolfssl/include/user_settings.h
+ 1. The `user_settings.h` can be found in _/path/to/esp_`/esp-idf/components/wolfssl/include/user_settings.h`
 
 ## Build examples
  1. See README in each example folder
@@ -34,7 +39,7 @@ Including the following examples:
  For question please email [support@wolfssl.com]
 
  Note: This is tested with :  
-   - OS: Ubuntu 18.04.1 LTS and Microsoft Windows 10 Pro 10.0.19041  
+   - OS: Ubuntu 18.04.1 LTS and Microsoft Windows 10 Pro 10.0.19041 and well as WSL Ubuntu
    - ESP-IDF: v4.1 and v4.0.1  
    - Module : ESP32-WROOM-32
 

IDE/Espressif/ESP-IDF/README_32se.md

@@ -1,35 +1,31 @@
 # DEMO program with ATECC608A on ESP-WROOM-32SE
 ## Overview
- Running demo programs with ATECC608A on 32SE by setting *WOLFSSL_ESPWROOM32SE* definition
+ Running demo programs with ATECC608A on 32SE by setting `WOLFSSL_ESPWROOM32SE` definition
 
 Including the following examples:
 
-* simple tls_client/tls_server
+* simple `tls_client`/`tls_server`
 * crypt benchmark
 
- The *user_settings.h* file enables some of the hardened settings. 
- 
-## Requirements
- 1. ESP-IDF development framework  
-    [https://docs.espressif.com/projects/esp-idf/en/latest/get-started/]
+ The `user_settings.h` file enables some of the hardened settings.
+
+## Requirements
+1. ESP-IDF development framework: https://docs.espressif.com/projects/esp-idf/en/latest/get-started/
+
+2. Microchip CryptoAuthentication Library: https://github.com/MicrochipTech/cryptoauthlib
 
- 2. Microchip CryptoAuthentication Library  
-    [https://github.com/MicrochipTech/cryptoauthlib]
-    
 ## Setup
- 1. wolfSSL under ESP-IDF. Please see [README.md](https://github.com/wolfSSL/wolfssl/blob/master/IDE/Espressif/ESP-IDF/README.md)
- 2. CryptoAuthentication Library under ESP-IDF. Please see [README.md](https://github.com/miyazakh/cryptoauthlib_esp_idf/blob/master/README.md)
- 
- 3. Uncomment out #define WOLFSSL_ESPWROOM32SE in /path/to/wolfssl/wolfssl/wolfcrypt/settings.h
- 
-    Note : Need to enable WOLFSSL_ESPIDF  
-    Note : crypt test will fail if enabled WOLFSSL_ESPWROOM32SE
- 
+1. wolfSSL under ESP-IDF. Please see [README.md](https://github.com/wolfSSL/wolfssl/blob/master/IDE/Espressif/ESP-IDF/README.md)
+2. CryptoAuthentication Library under ESP-IDF. Please see [README.md](https://github.com/miyazakh/cryptoauthlib_esp_idf/blob/master/README.md)
+3. Uncomment out `#define WOLFSSL_ESPWROOM32SE` in `/path/to/wolfssl/wolfssl/wolfcrypt/settings.h`
+    * **Note:** Need to enable `WOLFSSL_ESPIDF`
+    * **Note:** crypt test will fail if enabled `WOLFSSL_ESPWROOM32SE`
+
 ## Configuration
- 1. The *user_settings.h* can be found in /path/to/esp-idf/components/wolfssl/include/user_settings.h
+1. The `user_settings.h` can be found in `/path/to/esp-idf/components/wolfssl/include/user_settings.h`
 
 ## Build examples
- 1. See README in each example folder
+1. See `README` in each example folder
 
 ## Benchmark
 w/o atecc608a
@@ -48,11 +44,11 @@ ECDSA    256 verify         14 ops took 1.079 sec, avg 77.071 ms, 12.975 ops/sec
 ```
 
 ## Support
- For question please email [support@wolfssl.com]
+For question please email [support@wolfssl.com](mailto:support@wolfssl.com)
 
- Note: This is tested with the following condition:
- 
-- Model    : ESP32-WROOM-32SE  
-- ESP-IDF  : v3.3-beta1-39-g6cb37ecc5(commit hash : 6cb37ecc5)  
+Note: This is tested with the following condition:
+
+- Model    : ESP32-WROOM-32SE
+- ESP-IDF  : v3.3-beta1-39-g6cb37ecc5(commit hash : 6cb37ecc5)
 - CryptAuthLib: commit hash : c6b176e
 - OS       : Ubuntu 18.04.1 LTS (Bionic Beaver)

IDE/Espressif/ESP-IDF/dummy_config_h

@@ -1,6 +1,6 @@
 /* config.h - dummy
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/helper.c

@@ -1,6 +1,6 @@
 /* helper.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -118,7 +118,7 @@ int construct_argv()
 
     __argv[cnt] = malloc(10);
     sprintf(__argv[cnt], "benchmark");
-    __argv[9] = '\0';
+    __argv[cnt][9] = '\0';
     cnt = 1;
 
     while (*ch != '\0')

IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/client-tls.c

@@ -1,6 +1,6 @@
 /* client-tls-callback.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/include/wifi_connect.h

@@ -1,6 +1,6 @@
 /* user_settings.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/wifi_connect.c

@@ -1,6 +1,6 @@
 /* wifi_connect.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -51,10 +51,10 @@ static void set_time()
     time_t now;
     struct tm timeinfo;
     char strftime_buf[64];
-    /* please update the time if seeing unknown failure. */
-    /* this could cause TLS communication failure due to time expiration */
-    /* incleasing 31536000 seconds is close to spend 356 days.           */
-    utctime.tv_sec = 1598661910; /* dummy time: Fri Aug 29 09:45:00 2020 */
+    /* please update the time if seeing unknown failure when loading cert.  */
+    /* this could cause TLS communication failure due to time expiration    */
+    /* incleasing 31536000 seconds is close to spend 356 days.              */
+    utctime.tv_sec = 1619650800; /* dummy time: Wed April 28 23:00:00 2021 */
     utctime.tv_usec = 0;
     tz.tz_minuteswest = 0;
     tz.tz_dsttime = 0;

IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/include/wifi_connect.h

@@ -1,6 +1,6 @@
 /* wifi_connect.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/server-tls.c

@@ -1,6 +1,6 @@
 /* server-tls-callback.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/wifi_connect.c

@@ -1,6 +1,6 @@
 /* wifi_connect.c 
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -48,10 +48,10 @@ static void set_time()
     time_t now;
     struct tm timeinfo;
     char strftime_buf[64];
-    /* please update the time if seeing unknown failure. */
-    /* this could cause TLS communication failure due to time expiration */
-    /* incleasing 31536000 seconds is close to spend 356 days.           */
-    utctime.tv_sec = 1598661910; /* dummy time: Fri Aug 29 09:45:00 2020 */
+    /* please update the time if seeing unknown failure when loading cert.  */
+    /* this could cause TLS communication failure due to time expiration    */
+    /* incleasing 31536000 seconds is close to spend 356 days.              */
+    utctime.tv_sec = 1619650800; /* dummy time: Wed April 28 23:00:00 2021 */
     utctime.tv_usec = 0;
     tz.tz_minuteswest = 0;
     tz.tz_dsttime = 0;

IDE/Espressif/ESP-IDF/setup.sh

@@ -22,6 +22,20 @@ BASEDIR=`cd ${BASEDIR} && pwd -P`
 WOLFSSLLIB_TRG_DIR=${IDF_PATH}/components/wolfssl
 WOLFSSLEXP_TRG_DIR=${IDF_PATH}/examples/protocols
 
+if [ "$1" == "--verbose" ]; then
+  WOLFSSSL_SETUP_VERBOSE=true
+fi
+
+if [ "${WOLFSSSL_SETUP_VERBOSE}" == "true" ]; then
+  echo Verbose mode on!
+  echo BASEDIR=${BASEDIR}
+  echo SCRIPTDIR=${SCRIPTDIR}
+  echo WOLFSSL_ESPIDFDIR=${WOLFSSL_ESPIDFDIR}
+  echo WOLFSSLLIB_TRG_DIR=${WOLFSSLLIB_TRG_DIR}
+  echo WOLFSSLEXP_TRG_DIR=${WOLFSSLEXP_TRG_DIR}
+  echo ""
+fi
+
 if [ ! -d $IDF_PATH ]; then
     echo "ESP-IDF Development Framework doesn't exist.: $IDF_PATH"
     exit 1
@@ -31,7 +45,12 @@ fi
 pushd $IDF_PATH > /dev/null
 
 echo "Copy files into $IDF_PATH"
+
 # Remove/Create directories
+if [ "${WOLFSSSL_SETUP_VERBOSE}" == "true" ]; then
+  echo "Remove/Create directories..."
+fi
+
 ${RMDCMD} ${WOLFSSLLIB_TRG_DIR}/
 ${MKDCMD} ${WOLFSSLLIB_TRG_DIR}/
 
@@ -46,6 +65,11 @@ popd > /dev/null             # $WOLFSSL_ESPIDFDIR
 pushd ${BASEDIR} > /dev/null # WOLFSSL TOP DIR
 
 # copying ... files in src/ into $WOLFSSLLIB_TRG_DIR/src
+
+if [ "${WOLFSSSL_SETUP_VERBOSE}" == "true" ]; then
+  echo "Copying ... files in src/ into \$WOLFSSLLIB_TRG_DIR/srcs ..."
+fi
+
 ${CPDCMD} ./src/*.c ${WOLFSSLLIB_TRG_DIR}/src/
 
 
@@ -56,7 +80,12 @@ ${CPDCMD} -r ./wolfcrypt/benchmark ${WOLFSSLLIB_TRG_DIR}/wolfcrypt/
 
 ${CPDCMD} -r ./wolfssl/*.h ${WOLFSSLLIB_TRG_DIR}/wolfssl/
 ${CPDCMD} -r ./wolfssl/wolfcrypt ${WOLFSSLLIB_TRG_DIR}/wolfssl/
+
 # user_settings.h
+if [ "${WOLFSSSL_SETUP_VERBOSE}" == "true" ]; then
+  echo "Copying user_settings.h to ${WOLFSSLLIB_TRG_DIR}/include/"
+fi
+
 ${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/user_settings.h ${WOLFSSLLIB_TRG_DIR}/include/
 ${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/dummy_config_h ${WOLFSSLLIB_TRG_DIR}/include/config.h
 
@@ -71,15 +100,24 @@ ${CPDCMD} ./libs/component.mk ${WOLFSSLLIB_TRG_DIR}/
 pushd ${BASEDIR} > /dev/null # WOLFSSL TOP DIR
 
 # Benchmark program
+if [ "${WOLFSSSL_SETUP_VERBOSE}" == "true" ]; then
+  echo ""
+fi
 ${RMDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/
 ${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/
 ${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/main/
 
+${CPDCMD}    ${BASEDIR}/wolfcrypt/benchmark/benchmark.h ${BASEDIR}/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/benchmark.h
+${CPDCMD}    ${BASEDIR}/wolfcrypt/benchmark/benchmark.c ${BASEDIR}/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/benchmark.c
+
 ${CPDCMD} -r ./wolfcrypt/benchmark/benchmark.c ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/main/
 ${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_benchmark/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/
 ${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_benchmark/main/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_benchmark/main/
 
 # Crypt Test program
+if [ "${WOLFSSSL_SETUP_VERBOSE}" == "true" ]; then
+  echo "Copying wolfssl_test to ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/main/"
+fi
 ${RMDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/
 ${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/
 ${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/main/
@@ -89,6 +127,9 @@ ${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_test/* ${WOLFSSLEXP_TRG_DIR}/
 ${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_test/main/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_test/main/
 
 # TLS Client program
+if [ "${WOLFSSSL_SETUP_VERBOSE}" == "true" ]; then
+  echo "Copying TLS Client program to ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/..."
+fi
 ${RMDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/
 ${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/
 ${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/main/
@@ -99,6 +140,9 @@ ${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_client/main/* ${WOLFSSLEXP_TR
 ${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_client/main/include/* ${WOLFSSLEXP_TRG_DIR}/wolfssl_client/main/include/
 
 # TLS Server program
+if [ "${WOLFSSSL_SETUP_VERBOSE}" == "true" ]; then
+  echo "Copying TLS Server program to ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/..."
+fi
 ${RMDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/
 ${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/
 ${MKDCMD} ${WOLFSSLEXP_TRG_DIR}/wolfssl_server/main/
@@ -110,4 +154,8 @@ ${CPDCMD} -r ${WOLFSSL_ESPIDFDIR}/examples/wolfssl_server/main/include/* ${WOLFS
 
 popd > /dev/null # 
 
+if [ "${WOLFSSSL_SETUP_VERBOSE}" == "true" ]; then
+  echo "Copy complete!"
+fi
+
 exit 1

IDE/Espressif/ESP-IDF/setup_win.bat

@@ -32,10 +32,10 @@ xcopy /Y/Q %BASEDIR%\src\*.c %WOLFSSLLIB_TRG_DIR%\src\
 xcopy /Y/Q %BASEDIR%\wolfcrypt\src\*.c %WOLFSSLLIB_TRG_DIR%\wolfcrypt\src
 xcopy /Y/Q %BASEDIR%\wolfcrypt\src\*.i %WOLFSSLLIB_TRG_DIR%\wolfcrypt\src
 xcopy /E/Y/Q %BASEDIR%\wolfcrypt\src\port %WOLFSSLLIB_TRG_DIR%\wolfcrypt\src\port\
-xcopy /E/Y/Q %BASEDIR%\wolfcrypt\test\ %WOLFSSLLIB_TRG_DIR%\wolfcrypt\test\
-xcopy /E/Y/Q %BASEDIR%\wolfcrypt\benchmark\ %WOLFSSLLIB_TRG_DIR%\wolfcrypt\benchmark\
+xcopy /E/Y/Q %BASEDIR%\wolfcrypt\test %WOLFSSLLIB_TRG_DIR%\wolfcrypt\test\
+xcopy /E/Y/Q %BASEDIR%\wolfcrypt\benchmark %WOLFSSLLIB_TRG_DIR%\wolfcrypt\benchmark\
 xcopy /Y/Q %BASEDIR%\wolfssl\*.h %WOLFSSLLIB_TRG_DIR%\wolfssl\
-xcopy /E/Y/Q %BASEDIR%\wolfssl\wolfcrypt\ %WOLFSSLLIB_TRG_DIR%\wolfssl\wolfcrypt\
+xcopy /E/Y/Q %BASEDIR%\wolfssl\wolfcrypt %WOLFSSLLIB_TRG_DIR%\wolfssl\wolfcrypt\
 
 rem user_settings.h
 xcopy /F/Q %WOLFSSL_ESPIDFDIR%\user_settings.h %WOLFSSLLIB_TRG_DIR%\include\
@@ -49,6 +49,10 @@ xcopy /F/Q   %WOLFSSL_ESPIDFDIR%\libs\component.mk   %WOLFSSLLIB_TRG_DIR%\
 rem Benchmark program
 rmdir /S/Q %WOLFSSLEXP_TRG_DIR%\wolfssl_benchmark\
 mkdir      %WOLFSSLEXP_TRG_DIR%\wolfssl_benchmark\main\
+
+xcopy      %BASEDIR%\wolfcrypt\benchmark\benchmark.h  %BASEDIR%\IDE\Espressif\ESP-IDF\examples\wolfssl_benchmark\main\benchmark.h
+xcopy      %BASEDIR%\wolfcrypt\benchmark\benchmark.c  %BASEDIR%\IDE\Espressif\ESP-IDF\examples\wolfssl_benchmark\main\benchmark.c
+
 xcopy /F/Q %BASEDIR%\wolfcrypt\benchmark\benchmark.c %WOLFSSLEXP_TRG_DIR%\wolfssl_benchmark\main\
 xcopy /E/F/Q %WOLFSSL_ESPIDFDIR%\examples\wolfssl_benchmark %WOLFSSLEXP_TRG_DIR%\wolfssl_benchmark\
 

IDE/Espressif/ESP-IDF/test/test_wolfssl.c

@@ -666,7 +666,7 @@ TEST_CASE("wolfssl sha crypt-test", "[wolfssl]")
     ESP_LOGI(TAG, "sha256_test()");
     TEST_ASSERT_EQUAL(0, sha256_test());
 #endif
-#ifdef WOLSSL_SHA384
+#ifdef WOLFSSL_SHA384
     ESP_LOGI(TAG, "sha384_test()");
     TEST_ASSERT_EQUAL(0, sha384_test());
 #endif

IDE/Espressif/ESP-IDF/user_settings.h

@@ -1,6 +1,6 @@
 /* user_settings.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/GCC-ARM/Header/user_settings.h

@@ -1,6 +1,6 @@
 /* user_settings.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -637,6 +637,10 @@ extern unsigned int my_rng_seed_gen(void);
 #undef  NO_SIG_WRAPPER
 //#define NO_SIG_WRAPPER
 
+#undef WOLFSSL_IGNORE_FILE_WARN
+#define WOLFSSL_IGNORE_FILE_WARN
+
+
 #ifdef __cplusplus
 }
 #endif

IDE/GCC-ARM/Makefile

@@ -1,6 +1,6 @@
 BUILD_DIR = ./Build
 
-all: WolfSSLStaticLib WolfCryptTest WolfCryptBench WolfSSLClient
+all: WolfSSLStaticLib WolfCryptTest WolfCryptBench WolfSSLClient WolfSSLServer
 
 WolfCryptTest:
 	$(MAKE) -f Makefile.test
@@ -8,6 +8,8 @@ WolfCryptBench:
 	$(MAKE) -f Makefile.bench
 WolfSSLClient:
 	$(MAKE) -f Makefile.client
+WolfSSLServer:
+	$(MAKE) -f Makefile.server
 WolfSSLStaticLib:
 	$(MAKE) -f Makefile.static
 

IDE/GCC-ARM/Makefile.common

@@ -6,37 +6,39 @@ BUILD_DIR = ./Build
 
 # Toolchain location and prefix
 #TOOLCHAIN = 
-TOOLCHAIN = /opt/gcc-arm-none-eabi/bin/arm-none-eabi-
+TOOLCHAIN ?= /opt/gcc-arm-none-eabi/bin/arm-none-eabi-
 
 # Tools selection
 CC = $(TOOLCHAIN)gcc
-AS = $(TOOLCHAIN)gcc
-LD = $(TOOLCHAIN)gcc
+AS = $(CC)
+LD = $(CC)
 AR = $(TOOLCHAIN)ar
 NM = $(TOOLCHAIN)nm
-OBJCOPY = $(TOOLCHAIN)objcopy
-OBJDUMP = $(TOOLCHAIN)objdump
-SIZE = $(TOOLCHAIN)size
+OBJCOPY ?= $(TOOLCHAIN)objcopy
+OBJDUMP ?= $(TOOLCHAIN)objdump
+SIZE ?= $(TOOLCHAIN)size
 
 # Includes
-INC = -I./Header \
-	  -I./Source \
-	  -I../..
+USER_SETTINGS_DIR ?= ./Header
+INC = -I$(USER_SETTINGS_DIR) \
+      -I../..
 
 # Defines
 DEF = -DWOLFSSL_USER_SETTINGS
 
 # Architecture
-ARCHFLAGS = -mcpu=cortex-m4 -mthumb -mabi=aapcs -DUSE_WOLF_ARM_STARTUP
+ARCHFLAGS ?= -mcpu=cortex-m4 -mthumb -mabi=aapcs -DUSE_WOLF_ARM_STARTUP
 #ARCHFLAGS = -mcpu=cortex-m0 -mthumb -mabi=aapcs -DUSE_WOLF_ARM_STARTUP
 #ARCHFLAGS = -mcpu=cortex-r5 -mthumb -mabi=aapcs
 #ARCHFLAGS = -mcpu=cortex-a53 -mthumb -mabi=aapcs
 
 # Compiler and linker flags
-ASFLAGS = $(ARCHFLAGS)
-CFLAGS = $(ARCHFLAGS) -std=gnu99 -Wall -Wno-cpp
-LDFLAGS = $(ARCHFLAGS)
+ASFLAGS ?= $(ARCHFLAGS)
+CFLAGS_EXTRA ?= -Wno-cpp
+CFLAGS ?= $(ARCHFLAGS) -std=gnu99 -Wall $(CFLAGS_EXTRA)
+LDFLAGS ?= $(ARCHFLAGS)
 
+FIPS?=1
 # LD: Link with nosys
 LDFLAGS += --specs=nosys.specs
 
@@ -70,12 +72,15 @@ LDFLAGS += $(DBGFLAGS)
 # FILES
 
 # Port and Test/Benchmark
+ifndef NO_EXAMPLES
 SRC_C += ./Source/wolf_main.c
 SRC_C += ./Source/armtarget.c
 SRC_C += ../../wolfcrypt/test/test.c
 SRC_C += ../../wolfcrypt/benchmark/benchmark.c
+endif
 
 # WOLFSSL TLS FILES
+SRC_C += ../../src/bio.c
 SRC_C += ../../src/crl.c
 SRC_C += ../../src/internal.c
 SRC_C += ../../src/keys.c
@@ -87,7 +92,9 @@ SRC_C += ../../src/tls13.c
 SRC_C += ../../src/wolfio.c
 
 # wolfCrypt Core (FIPS)
+ifeq "$(FIPS)" "1"
 SRC_C += ../../wolfcrypt/src/wolfcrypt_first.c
+endif
 SRC_C += ../../wolfcrypt/src/aes.c
 SRC_C += ../../wolfcrypt/src/cmac.c
 SRC_C += ../../wolfcrypt/src/des3.c
@@ -100,26 +107,38 @@ SRC_C += ../../wolfcrypt/src/sha.c
 SRC_C += ../../wolfcrypt/src/sha256.c
 SRC_C += ../../wolfcrypt/src/sha512.c
 SRC_C += ../../wolfcrypt/src/sha3.c
+ifeq "$(FIPS)" "1"
 SRC_C += ../../wolfcrypt/src/fips.c
 SRC_C += ../../wolfcrypt/src/fips_test.c
 SRC_C += ../../wolfcrypt/src/wolfcrypt_last.c
+endif
 
 # wolfCrypt Additional
+SRC_C += ../../wolfcrypt/src/asm.c
 SRC_C += ../../wolfcrypt/src/asn.c
+SRC_C += ../../wolfcrypt/src/blake2s.c
 SRC_C += ../../wolfcrypt/src/chacha.c
-SRC_C += ../../wolfcrypt/src/cmac.c
+SRC_C += ../../wolfcrypt/src/chacha20_poly1305.c
 SRC_C += ../../wolfcrypt/src/coding.c
 SRC_C += ../../wolfcrypt/src/compress.c
 SRC_C += ../../wolfcrypt/src/cpuid.c
 SRC_C += ../../wolfcrypt/src/cryptocb.c
 SRC_C += ../../wolfcrypt/src/curve25519.c
+SRC_C += ../../wolfcrypt/src/curve448.c
+SRC_C += ../../wolfcrypt/src/ecc_fp.c
+SRC_C += ../../wolfcrypt/src/eccsi.c
 SRC_C += ../../wolfcrypt/src/ed25519.c
+SRC_C += ../../wolfcrypt/src/ed448.c
 SRC_C += ../../wolfcrypt/src/error.c
+SRC_C += ../../wolfcrypt/src/evp.c
+SRC_C += ../../wolfcrypt/src/fe_448.c
 SRC_C += ../../wolfcrypt/src/fe_low_mem.c
 SRC_C += ../../wolfcrypt/src/fe_operations.c
+SRC_C += ../../wolfcrypt/src/ge_448.c
 SRC_C += ../../wolfcrypt/src/ge_low_mem.c
 SRC_C += ../../wolfcrypt/src/ge_operations.c
 SRC_C += ../../wolfcrypt/src/hash.c
+SRC_C += ../../wolfcrypt/src/kdf.c
 SRC_C += ../../wolfcrypt/src/integer.c
 SRC_C += ../../wolfcrypt/src/logging.c
 SRC_C += ../../wolfcrypt/src/md5.c
@@ -129,6 +148,8 @@ SRC_C += ../../wolfcrypt/src/pkcs12.c
 SRC_C += ../../wolfcrypt/src/pkcs7.c
 SRC_C += ../../wolfcrypt/src/poly1305.c
 SRC_C += ../../wolfcrypt/src/pwdbased.c
+SRC_C += ../../wolfcrypt/src/rc2.c
+SRC_C += ../../wolfcrypt/src/sakke.c
 SRC_C += ../../wolfcrypt/src/signature.c
 SRC_C += ../../wolfcrypt/src/srp.c
 SRC_C += ../../wolfcrypt/src/sp_arm32.c
@@ -137,13 +158,25 @@ SRC_C += ../../wolfcrypt/src/sp_armthumb.c
 SRC_C += ../../wolfcrypt/src/sp_c32.c
 SRC_C += ../../wolfcrypt/src/sp_c64.c
 SRC_C += ../../wolfcrypt/src/sp_cortexm.c
+SRC_C += ../../wolfcrypt/src/sp_dsp32.c
 SRC_C += ../../wolfcrypt/src/sp_int.c
+SRC_C += ../../wolfcrypt/src/sp_x86_64.c
 SRC_C += ../../wolfcrypt/src/tfm.c
+SRC_C += ../../wolfcrypt/src/wc_dsp.c
 SRC_C += ../../wolfcrypt/src/wc_encrypt.c
+SRC_C += ../../wolfcrypt/src/wc_pkcs11.c
 SRC_C += ../../wolfcrypt/src/wc_port.c
 SRC_C += ../../wolfcrypt/src/wolfevent.c
 SRC_C += ../../wolfcrypt/src/wolfmath.c
 
+ifeq "$(ASYNC)" "1"
+SRC_C += ../../wolfcrypt/src/async.c
+endif
+
+ifeq "$(SELFTEST)" "1"
+SRC_C += ../../wolfcrypt/src/selftest.c
+endif
+
 # wolfCrypt non-standard algorithms (disabled by default)
 SRC_C += ../../wolfcrypt/src/arc4.c
 SRC_C += ../../wolfcrypt/src/blake2b.c
@@ -165,11 +198,11 @@ vpath %.c $(dir $(SRC_C))
 
 build_hex: $(BUILD_DIR) $(BUILD_DIR)/$(BIN).hex
 	@echo ""
-	$(CMD_ECHO) @$(SIZE) $(BUILD_DIR)/$(BIN).elf
+	$(CMD_ECHO) $(SIZE) $(BUILD_DIR)/$(BIN).elf
 
 build_static: $(BUILD_DIR) $(BUILD_DIR)/$(BIN).a
 	@echo ""
-	$(CMD_ECHO) @$(SIZE) $(BUILD_DIR)/$(BIN).a
+	$(CMD_ECHO) $(SIZE) $(BUILD_DIR)/$(BIN).a
 
 $(BUILD_DIR):
 	$(CMD_ECHO) mkdir -p $(BUILD_DIR)

IDE/GCC-ARM/Makefile.server

@@ -0,0 +1,7 @@
+# Project name
+BIN = WolfSSLServer
+SRC_C = ./Source/tls_server.c
+
+all: build_hex
+
+include Makefile.common

IDE/GCC-ARM/Source/armtarget.c

@@ -1,6 +1,6 @@
 /* armtarget.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -71,7 +71,7 @@ void reset_handler(void)
 
     /* Init heap */
     __heap_start__[0] = 0;
-    __heap_start__[1] = ((uint32_t)__heap_end__ - (uint32_t)__heap_start__);
+    __heap_start__[1] = ((uintptr_t)__heap_end__ - (uintptr_t)__heap_start__);
 #endif /* USE_WOLF_ARM_STARTUP */
 
     /* Start main */
@@ -142,20 +142,20 @@ void HardFault_HandlerC( uint32_t *hardfault_args )
     _BFAR = (*((volatile uint32_t *)(0xE000ED38)));
 
     printf ("\n\nHard fault handler (all numbers in hex):\n");
-    printf ("R0 = %ux\n", stacked_r0);
-    printf ("R1 = %ux\n", stacked_r1);
-    printf ("R2 = %ux\n", stacked_r2);
-    printf ("R3 = %ux\n", stacked_r3);
-    printf ("R12 = %ux\n", stacked_r12);
-    printf ("LR [R14] = %ux  subroutine call return address\n", stacked_lr);
-    printf ("PC [R15] = %ux  program counter\n", stacked_pc);
-    printf ("PSR = %ux\n", stacked_psr);
-    printf ("CFSR = %ux\n", _CFSR);
-    printf ("HFSR = %ux\n", _HFSR);
-    printf ("DFSR = %ux\n", _DFSR);
-    printf ("AFSR = %ux\n", _AFSR);
-    printf ("MMAR = %ux\n", _MMAR);
-    printf ("BFAR = %ux\n", _BFAR);
+    printf ("R0 = %lx\n", stacked_r0);
+    printf ("R1 = %lx\n", stacked_r1);
+    printf ("R2 = %lx\n", stacked_r2);
+    printf ("R3 = %lx\n", stacked_r3);
+    printf ("R12 = %lx\n", stacked_r12);
+    printf ("LR [R14] = %lx  subroutine call return address\n", stacked_lr);
+    printf ("PC [R15] = %lx  program counter\n", stacked_pc);
+    printf ("PSR = %lx\n", stacked_psr);
+    printf ("CFSR = %lx\n", _CFSR);
+    printf ("HFSR = %lx\n", _HFSR);
+    printf ("DFSR = %lx\n", _DFSR);
+    printf ("AFSR = %lx\n", _AFSR);
+    printf ("MMAR = %lx\n", _MMAR);
+    printf ("BFAR = %lx\n", _BFAR);
 
     // Break into the debugger
     __asm("BKPT #0\n");

IDE/GCC-ARM/Source/benchmark_main.c

@@ -1,6 +1,6 @@
 /* benchmark_main.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/GCC-ARM/Source/test_main.c

@@ -1,6 +1,6 @@
 /* test_main.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/GCC-ARM/Source/tls_client.c

@@ -1,6 +1,6 @@
 /* tls_client.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -23,7 +23,7 @@
 #include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
 
-#ifndef WOLFCRYPT_ONLY
+#if !defined(WOLFCRYPT_ONLY) && !defined(NO_WOLFSSL_CLIENT)
 
 #include <wolfssl/ssl.h>
 #include <wolfssl/wolfcrypt/logging.h>
@@ -100,11 +100,11 @@ static int tls_client(void)
     /*---------------------*/
     /* for no peer auth:   */
     /*---------------------*/
-    wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
+    wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_NONE, NULL);
     /*---------------------*/
     /* end peer auth option*/
     /*---------------------*/
-    if ((ret = wolfSSL_CTX_set_cipher_list(ctx, "ECDHE-ECDSA-AES128-SHA256")) != SSL_SUCCESS) {
+    if ((ret = wolfSSL_CTX_set_cipher_list(ctx, "ECDHE-ECDSA-AES128-SHA256")) != WOLFSSL_SUCCESS) {
         wolfSSL_CTX_free(ctx);
         printf("CTXset_cipher_list failed, error: %d\n", ret);
         goto fail;
@@ -123,14 +123,14 @@ static int tls_client(void)
     }
 
     /* non blocking accept and connect */
-    ret = SSL_FAILURE;
+    ret = WOLFSSL_FAILURE;
 
-    while (ret != SSL_SUCCESS) {
+    while (ret != WOLFSSL_SUCCESS) {
         /* client connect */
         ret = wolfSSL_connect(ssl);
         error = wolfSSL_get_error(ssl, 0);
-        if (ret != SSL_SUCCESS) {
-            if (error != SSL_ERROR_WANT_READ && error != SSL_ERROR_WANT_WRITE) {
+        if (ret != WOLFSSL_SUCCESS) {
+            if (error != WOLFSSL_ERROR_WANT_READ && error != WOLFSSL_ERROR_WANT_WRITE) {
                 /* Fail */
                 printf("wolfSSL connect failed with return code %d\n", error);
                 goto fail;
@@ -146,7 +146,7 @@ static int tls_client(void)
         ret   = wolfSSL_write(ssl, msg, msgSz);
         error = wolfSSL_get_error(ssl, 0);
         if (ret != msgSz) {
-            if (error != SSL_ERROR_WANT_READ && error != SSL_ERROR_WANT_WRITE) {
+            if (error != WOLFSSL_ERROR_WANT_READ && error != WOLFSSL_ERROR_WANT_WRITE) {
                 /* Write failed */
                 goto fail;
             }
@@ -159,7 +159,7 @@ static int tls_client(void)
         ret = wolfSSL_read(ssl, reply, sizeof(reply) - 1);
         error = wolfSSL_get_error(ssl, 0);
         if (ret < 0) {
-            if (error != SSL_ERROR_WANT_READ && error != SSL_ERROR_WANT_WRITE) {
+            if (error != WOLFSSL_ERROR_WANT_READ && error != WOLFSSL_ERROR_WANT_WRITE) {
                 /* Can put print here, the server enters a loop waiting to read
                  * a confirmation message at this point */
                 // printf("client read failed\n");
@@ -186,14 +186,14 @@ fail:
 
     return -1;
 }
-#endif
+#endif /* !WOLFCRYPT_ONLY && !NO_WOLFSSL_CLIENT */
 
 
 int main(void)
 {
     int ret;
 
-#ifndef WOLFCRYPT_ONLY
+#if !defined(WOLFCRYPT_ONLY) && !defined(NO_WOLFSSL_CLIENT)
     wolfSSL_Init();
 
     ret = tls_client();

IDE/GCC-ARM/Source/tls_server.c

@@ -0,0 +1,206 @@
+/* tls_server.c
+ *
+ * Copyright (C) 2006-2021 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/error-crypt.h>
+
+#if !defined(WOLFCRYPT_ONLY) && !defined(NO_WOLFSSL_SERVER)
+
+#include <wolfssl/ssl.h>
+#include <wolfssl/wolfcrypt/logging.h>
+#include <stdio.h>
+
+#define MAXSZ              1024
+
+/*------------------------------------------------------------------------*/
+/* TLS SERVER */
+/*------------------------------------------------------------------------*/
+static int CbIORecv(WOLFSSL *ssl, char *buf, int sz, void *ctx)
+{
+    int ret = WOLFSSL_CBIO_ERR_GENERAL;
+
+    (void)ssl;
+    (void)ctx;
+
+    /* TODO: Exchange data over your own transport */
+    #warning TODO: Implement your own recv data transport
+#if 0
+    ret = usart_read_buffer_wait(&cdc_uart_module, buf, sz);
+    if (ret == STATUS_ERR_TIMEOUT)
+        return WOLFSSL_CBIO_ERR_WANT_READ;
+
+    return (ret == STATUS_OK) ? sz : WOLFSSL_CBIO_ERR_GENERAL;
+#else
+    return ret;
+#endif
+}
+
+static int CbIOSend(WOLFSSL *ssl, char *buf, int sz, void *ctx)
+{
+    int ret = WOLFSSL_CBIO_ERR_GENERAL;
+
+    (void)ssl;
+    (void)ctx;
+
+    /* TODO: Exchange data over your own transport */
+    #warning TODO: Implement your own send data transport
+#if 0
+    ret = usart_write_buffer_wait(&cdc_uart_module, buf, sz);
+    if (ret == STATUS_ERR_TIMEOUT)
+        return WOLFSSL_CBIO_ERR_WANT_WRITE;
+
+    return (ret == STATUS_OK) ? sz : WOLFSSL_CBIO_ERR_GENERAL;
+#else
+    return ret;
+#endif
+}
+
+static int tls_server(void)
+{
+    char reply[MAXSZ];
+    int ret, error;
+    WOLFSSL* ssl = NULL;
+    WOLFSSL_CTX* ctx = NULL;
+
+    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method())) == NULL) {
+        printf("CTXnew failed.\n");
+        goto fail;
+    }
+
+    /*------------------------------------------------------------------------*/
+    /* ECDHE-ECDSA */
+    /*------------------------------------------------------------------------*/
+    /*--------------------*/
+    /* for peer auth use: */
+    /*--------------------*/
+    //    wolfSSL_CTX_load_verify_buffer(ctx, rsa_key_der_1024,
+    //                                    sizeof_rsa_key_der_1024, SSL_FILETYPE_ASN1);
+    //    wolfSSL_CTX_load_verify_buffer(ctx, server_cert_der_1024,
+    //                                    sizeof_server_cert_der_1024, SSL_FILETYPE_ASN1);
+    /*---------------------*/
+    /* for no peer auth:   */
+    /*---------------------*/
+    wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_NONE, NULL);
+    /*---------------------*/
+    /* end peer auth option*/
+    /*---------------------*/
+    if ((ret = wolfSSL_CTX_set_cipher_list(ctx, "ECDHE-ECDSA-AES128-SHA256")) != WOLFSSL_SUCCESS) {
+        wolfSSL_CTX_free(ctx);
+        printf("CTXset_cipher_list failed, error: %d\n", ret);
+        goto fail;
+    }
+    /*------------------------------------------------------------------------*/
+    /* END CIPHER SUITE OPTIONS */
+    /*------------------------------------------------------------------------*/
+    wolfSSL_CTX_SetIORecv(ctx, CbIORecv);
+    wolfSSL_CTX_SetIOSend(ctx, CbIOSend);
+
+    if ((ssl = wolfSSL_new(ctx)) == NULL) {
+        error = wolfSSL_get_error(ssl, 0);
+        printf("wolfSSL_new failed %d\n", error);
+        wolfSSL_CTX_free(ctx);
+        return -1;
+    }
+
+    /* non blocking accept and connect */
+    ret = WOLFSSL_FAILURE;
+
+    while (ret != WOLFSSL_SUCCESS) {
+        /* server accept */
+        ret = wolfSSL_accept(ssl);
+        error = wolfSSL_get_error(ssl, 0);
+        if (ret != WOLFSSL_SUCCESS) {
+            if (error != WOLFSSL_ERROR_WANT_READ && error != WOLFSSL_ERROR_WANT_WRITE) {
+                /* Fail */
+                printf("wolfSSL accept failed with return code %d\n", error);
+                goto fail;
+            }
+        }
+        /* Success */
+    }
+
+    /* read and write */
+    while (1) {
+        /* server read */
+        ret = wolfSSL_read(ssl, reply, sizeof(reply) - 1);
+        error = wolfSSL_get_error(ssl, 0);
+        if (ret < 0) {
+            if (error != WOLFSSL_ERROR_WANT_READ && error != WOLFSSL_ERROR_WANT_WRITE) {
+                /* Can put print here, the server enters a loop waiting to read
+                 * a confirmation message at this point */
+                // printf("server read failed\n");
+                goto fail;
+            }
+            continue;
+        }
+        else {
+            /* Can put print here, the server enters a loop waiting to read
+             * a confirmation message at this point */
+            reply[ret] = '\0';
+            // printf("Server Received Reply: %s\n", reply);
+            break;
+        }
+
+    }
+
+    while (1) {
+        /* server write / echo */
+        ret   = wolfSSL_write(ssl, reply, XSTRLEN(reply));
+        error = wolfSSL_get_error(ssl, 0);
+        if (ret != XSTRLEN(reply)) {
+            if (error != WOLFSSL_ERROR_WANT_READ && error != WOLFSSL_ERROR_WANT_WRITE) {
+                /* Write failed */
+                goto fail;
+            }
+        }
+        /* Write succeeded */
+        break;
+    }
+
+    return 0;
+
+fail:
+    wolfSSL_shutdown(ssl);
+    wolfSSL_free(ssl);
+    wolfSSL_CTX_free(ctx);
+
+    return -1;
+}
+#endif /* !WOLFCRYPT_ONLY && !NO_WOLFSSL_SERVER */
+
+
+int main(void)
+{
+    int ret;
+
+#if !defined(WOLFCRYPT_ONLY) && !defined(NO_WOLFSSL_SERVER)
+    wolfSSL_Init();
+
+    ret = tls_server();
+
+    wolfSSL_Cleanup();
+#else
+    ret = NOT_COMPILED_IN;
+#endif
+
+	return ret;
+}

IDE/GCC-ARM/Source/wolf_main.c

@@ -1,6 +1,6 @@
 /* wolf_main.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/GCC-ARM/include.am

@@ -8,11 +8,13 @@ EXTRA_DIST+= IDE/GCC-ARM/Source/wolf_main.c
 EXTRA_DIST+= IDE/GCC-ARM/Source/benchmark_main.c
 EXTRA_DIST+= IDE/GCC-ARM/Source/test_main.c
 EXTRA_DIST+= IDE/GCC-ARM/Source/tls_client.c
+EXTRA_DIST+= IDE/GCC-ARM/Source/tls_server.c
 EXTRA_DIST+= IDE/GCC-ARM/linker.ld
 EXTRA_DIST+= IDE/GCC-ARM/linker_fips.ld
 EXTRA_DIST+= IDE/GCC-ARM/Makefile
 EXTRA_DIST+= IDE/GCC-ARM/Makefile.bench
 EXTRA_DIST+= IDE/GCC-ARM/Makefile.client
+EXTRA_DIST+= IDE/GCC-ARM/Makefile.server
 EXTRA_DIST+= IDE/GCC-ARM/Makefile.common
 EXTRA_DIST+= IDE/GCC-ARM/Makefile.test
 EXTRA_DIST+= IDE/GCC-ARM/Makefile.static

IDE/HEXAGON/DSP/Makefile

@@ -1,6 +1,6 @@
 # Makefile
 #
-# Copyright (C) 2006-2020 wolfSSL Inc.
+# Copyright (C) 2006-2021 wolfSSL Inc.
 #
 # This file is part of wolfSSL.
 #
@@ -17,6 +17,7 @@
 # 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
+#/
 
 ENVI=hexagon
 

IDE/HEXAGON/Makefile

@@ -1,6 +1,6 @@
 # Makefile
 #
-# Copyright (C) 2006-2020 wolfSSL Inc.
+# Copyright (C) 2006-2021 wolfSSL Inc.
 #
 # This file is part of wolfSSL.
 #
@@ -17,6 +17,7 @@
 # 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
+#/
 
 ENVI=UbuntuARM
 

IDE/HEXAGON/ecc-verify-benchmark.c

@@ -1,6 +1,6 @@
 /* ecc-verify-benchmark.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/HEXAGON/ecc-verify.c

@@ -1,6 +1,6 @@
 /* ecc-verify.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/IAR-EWARM/Projects/benchmark/benchmark-main.c

@@ -1,6 +1,6 @@
 /* benchmark-main.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/IAR-EWARM/Projects/benchmark/current_time.c

@@ -1,6 +1,6 @@
 /* current-time.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/IAR-EWARM/Projects/common/minimum-startup.c

@@ -1,6 +1,6 @@
 /* minimum-startup.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp

@@ -1975,6 +1975,9 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\hash.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\kdf.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\hc128.c</name>
     </file>

IDE/IAR-EWARM/Projects/test/test-main.c

@@ -1,6 +1,6 @@
 /* test-main.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_lib_SAMV71_XULT/wolfcrypt_lib.ewp

@@ -1956,6 +1956,9 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\hash.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\kdf.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\hmac.c</name>
     </file>

IDE/IAR-EWARM/embOS/SAMV71_XULT/embOS_wolfcrypt_lib_SAMV71_XULT/wolfcrypt_lib.ewt

@@ -2346,6 +2346,9 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\hash.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\kdf.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\..\wolfcrypt\src\hmac.c</name>
     </file>

IDE/IAR-EWARM/embOS/custom_port/README_custom_port

@@ -45,6 +45,7 @@ wolfssl (latest version)
  #     hmac.c                  tfm.c           #
  #     md4.c                   wc_encrypt.c    #
  #     md5.c                   wc_port.c       #
+ #     kdf.c                                   #
  #---------------------------------------------#
 
 5. Once those are all added go to

IDE/INTIME-RTOS/libwolfssl.vcxproj

@@ -46,6 +46,7 @@
     <ClCompile Include="..\..\wolfcrypt\src\ge_low_mem.c" />
     <ClCompile Include="..\..\wolfcrypt\src\ge_operations.c" />
     <ClCompile Include="..\..\wolfcrypt\src\hash.c" />
+    <ClCompile Include="..\..\wolfcrypt\src\kdf.c" />
     <ClCompile Include="..\..\wolfcrypt\src\hc128.c" />
     <ClCompile Include="..\..\wolfcrypt\src\hmac.c" />
     <ClCompile Include="..\..\wolfcrypt\src\idea.c" />

IDE/INTIME-RTOS/user_settings.h

@@ -14,7 +14,7 @@ extern "C" {
 #define INTIME_RTOS
 
 #undef  WOLF_EXAMPLES_STACK
-#define WOLF_EXAMPLES_STACK         65536
+#define WOLF_EXAMPLES_STACK         (1<<17)
 
 #undef  WOLFSSL_GENERAL_ALIGNMENT
 #define WOLFSSL_GENERAL_ALIGNMENT   4
@@ -27,7 +27,7 @@ extern "C" {
 
 /* disable directory support */
 #undef  NO_WOLFSSL_DIR
-#define NO_WOLFSSL_DIR
+//#define NO_WOLFSSL_DIR
 
 /* disable writev */
 #undef  NO_WRITEV

IDE/INTIME-RTOS/wolfExamples.vcxproj

@@ -66,7 +66,7 @@
     </Link>
     <ClCompile>
       <ExceptionHandling>Async</ExceptionHandling>
-      <PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;_USE_64BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>

IDE/KDS/.project

@@ -165,6 +165,11 @@
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/wolfcrypt/src/hash.c</locationURI>
 		</link>
+		<link>
+			<name>src/wolfcrypt-src/kdf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/wolfcrypt/src/kdf.c</locationURI>
+		</link>
 		<link>
 			<name>src/wolfcrypt-src/hc128.c</name>
 			<type>1</type>

IDE/LINUX-SGX/sgx_t_static.mk

@@ -61,6 +61,7 @@ Wolfssl_C_Files :=$(WOLFSSL_ROOT)/wolfcrypt/src/aes.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/ecc.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/error.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/hash.c\
+					$(WOLFSSL_ROOT)/wolfcrypt/src/kdf.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/hc128.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/hmac.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/integer.c\

IDE/LPCXPRESSO/lib_wolfssl/lpc_18xx_port.c

@@ -1,6 +1,6 @@
 /* lpc_18xx_port.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/LPCXPRESSO/wolf_example/src/lpc_18xx_startup.c

@@ -1,6 +1,6 @@
 /* lpc_18xx_startup.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/M68K/Makefile

@@ -20,6 +20,7 @@ CSRCS := ../../wolfcrypt/src/rsa.c \
         ../../wolfcrypt/src/memory.c \
         ../../wolfcrypt/src/coding.c \
         ../../wolfcrypt/src/hash.c \
+        ../../wolfcrypt/src/kdf.c \
         ../../wolfcrypt/src/hmac.c \
         ../../wolfcrypt/src/md5.c \
         ../../wolfcrypt/src/wc_port.c \

IDE/M68K/benchmark/main.cpp

@@ -1,6 +1,6 @@
 /* main.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/M68K/testwolfcrypt/main.cpp

@@ -1,6 +1,6 @@
 /* main.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK-ARM/LPC43xx/time-LCP43xx.c

@@ -1,6 +1,6 @@
 /* time.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK-ARM/MDK-ARM/wolfSSL/cert_data.c

@@ -1,6 +1,6 @@
 /* certs_test.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h

@@ -1,6 +1,6 @@
 /* config-BEREFOOT.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -215,12 +215,6 @@
 #define BUILD_AESGCM
 #endif
 //  </e>
-//      <e>NTRU (need License, "crypto_ntru.h")
-#define MDK_CONF_NTRU 0
-#if MDK_CONF_NTRU == 1
-#define HAVE_NTRU
-#endif
-//  </e>
 //  </h>
 
 //  <h>Others

IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h

@@ -1,6 +1,6 @@
 /* config-FS.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -252,12 +252,6 @@
 #define BUILD_AESGCM
 #endif
 //  </e>
-//      <e>NTRU (need License, "crypto_ntru.h")
-#define MDK_CONF_NTRU 0
-#if MDK_CONF_NTRU == 1
-#define HAVE_NTRU
-#endif
-//  </e>
 //  </h>
 
 //  <h>Others

IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h

@@ -1,6 +1,6 @@
 /* config-RTX-TCP-FS.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -274,12 +274,6 @@
 #define BUILD_AESGCM
 #endif
 //  </e>
-//      <e>NTRU (need License, "crypto_ntru.h")
-#define MDK_CONF_NTRU 0
-#if MDK_CONF_NTRU == 1
-#define HAVE_NTRU
-#endif
-//  </e>
 //  </h>
 
 //  <h>Others

IDE/MDK-ARM/MDK-ARM/wolfSSL/config.h

@@ -1,6 +1,6 @@
 /* config.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK-ARM/MDK-ARM/wolfSSL/main.c

@@ -1,6 +1,6 @@
 /* main.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c

@@ -1,6 +1,6 @@
 /*shell.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK-ARM/MDK-ARM/wolfSSL/time-CortexM3-4.c

@@ -1,6 +1,6 @@
 /* time-STM32F2.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK-ARM/MDK-ARM/wolfSSL/time-dummy.c

@@ -1,6 +1,6 @@
 /* time-dummy.c.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.c

@@ -1,6 +1,6 @@
 /* wolfssl_KEIL_RL.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -197,6 +197,7 @@ FILE * wolfSSL_fopen(const char *name, const char *openmode)
     #define PATHSIZE 100
     char path[PATHSIZE] ; char *p ;
 
+    if (name == NULL) return NULL;
     if(strlen(name) > PATHSIZE)return(NULL) ;
 
     for(i = 0; i<= strlen(name); i++) {

IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.h

@@ -1,6 +1,6 @@
 /* wolfssl_KEIL_RL.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt

@@ -1181,6 +1181,19 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <Focus>0</Focus>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\wolfcrypt\src\kdf.c</PathWithFileName>
+      <FilenameWithoutPath>kdf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>

IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj

@@ -626,6 +626,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\wolfcrypt\src\hash.c</FilePath>
             </File>
+            <File>
+              <FileName>kdf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\wolfcrypt\src\kdf.c</FilePath>
+            </File>
             <File>
               <FileName>misc.c</FileName>
               <FileType>1</FileType>
@@ -1335,6 +1340,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\wolfcrypt\src\hash.c</FilePath>
             </File>
+            <File>
+              <FileName>kdf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\wolfcrypt\src\kdf.c</FilePath>
+            </File>
             <File>
               <FileName>misc.c</FileName>
               <FileType>1</FileType>
@@ -2044,6 +2054,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\wolfcrypt\src\hash.c</FilePath>
             </File>
+            <File>
+              <FileName>kdf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\wolfcrypt\src\kdf.c</FilePath>
+            </File>
             <File>
               <FileName>misc.c</FileName>
               <FileType>1</FileType>

IDE/MDK-ARM/STM32F2xx_StdPeriph_Lib/time-STM32F2xx.c

@@ -1,6 +1,6 @@
 /* time-STM32F2xx.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK5-ARM/Conf/user_settings.h

@@ -1,6 +1,6 @@
 /* user_settings.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -360,13 +360,6 @@
 #define HAVE_PKCS7
 #endif
 //  </e>
-
-//      <e>NTRU (need License, "crypto_ntru.h")
-#define MDK_CONF_NTRU 0
-#if MDK_CONF_NTRU == 1
-#define HAVE_NTRU
-#endif
-//  </e>
 //  </h>
 
 //      <e>Random Seed, for TEST Only

IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h

@@ -1,6 +1,6 @@
 /* wolfssl_KEIL_ARM.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *

IDE/MDK5-ARM/Projects/CryptBenchmark/RTE/wolfSSL/user_settings.h

@@ -1,6 +1,6 @@
 /* user_settings.h
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -360,13 +360,6 @@
 #define HAVE_PKCS7
 #endif
 //  </e>
-
-//      <e>NTRU (need License, "crypto_ntru.h")
-#define MDK_CONF_NTRU 0
-#if MDK_CONF_NTRU == 1
-#define HAVE_NTRU
-#endif
-//  </e>
 //  </h>
 
 //      <e>Random Seed, for TEST Only

IDE/MDK5-ARM/Projects/CryptBenchmark/main.c

@@ -1,6 +1,6 @@
 /* main.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *