Skip to content

Gn cc32 xxsdk 2 10 00 04 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gneidermeier wants to merge 7 commits into
base: feat/CC32XXSDK_2-10-00-04
Choose a base branch
from
Open

Gn cc32 xxsdk 2 10 00 04 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f7aeabd
Adding "-DNO_WOLFSSL_DIR & -DWOLFSSL_USER_IO" to cc3220sf config, as…
Sep 30, 2019
cb91dd0
Project changes to update WolfSSL version.
Oct 1, 2019
38e4d13
Note using wolfSSL 'v3.15.5-stable'
Oct 1, 2019
561bef2
WOLFSSL_BASE64_ENCODE
Oct 2, 2019
e4d623c
Remove 'USE_FAST_MATH' ... not necessary for HAVE_ECC (and likely cau…
Oct 3, 2019
d3ca548
Flags to enable ECC in lib Xively ... making consistent w/ our libIOT…
Oct 3, 2019
56c0c2f
Trying to make wolfSSL related configs consistent betw. wSSL .cssproj…
Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions examples/cc3220sf/wolfssl_ccs/.cproject
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEFINE.1016586571" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.compilerID.DEFINE" valueType="definedSymbols">
<listOptionValue builtIn="false" value="${XDC_SYMBOLS}"/>
<listOptionValue builtIn="false" value="${COM_TI_SIMPLELINK_CC32XX_SDK_SYMBOLS}"/>
<listOptionValue builtIn="false" value="ECC_TIMING_RESISTANT"/>
<listOptionValue builtIn="false" value="WC_RSA_BLINDING"/>
<listOptionValue builtIn="false" value="HAVE_ECC"/>
<listOptionValue builtIn="false" value="cc3220sf"/>
<listOptionValue builtIn="false" value="DEBUG_WOLFSSL"/>
<listOptionValue builtIn="false" value="CC32XXWARE"/>
Expand Down
19 changes: 17 additions & 2 deletions examples/cc3220sf/wolfssl_ccs/.project
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
<type>1</type>
<locationURI>WOLFSSL_DIR/wolfcrypt/src/dh.c</locationURI>
</link>
<link>
<name>wolfcrypt/ecc.c</name>
<type>1</type>
<locationURI>WOLFSSL_DIR/wolfcrypt/src/ecc.c</locationURI>
</link>
<link>
<name>wolfcrypt/error.c</name>
<type>1</type>
Expand Down Expand Up @@ -105,6 +110,11 @@
<type>1</type>
<locationURI>WOLFSSL_DIR/wolfcrypt/src/sha256.c</locationURI>
</link>
<link>
<name>wolfcrypt/tfm.c</name>
<type>1</type>
<locationURI>WOLFSSL_DIR/wolfcrypt/src/tfm.c</locationURI>
</link>
<link>
<name>wolfcrypt/wc_encrypt.c</name>
<type>1</type>
Expand All @@ -115,15 +125,20 @@
<type>1</type>
<locationURI>WOLFSSL_DIR/wolfcrypt/src/wc_port.c</locationURI>
</link>
<link>
<name>wolfcrypt/wolfmath.c</name>
<type>1</type>
<locationURI>WOLFSSL_DIR/wolfcrypt/src/wolfmath.c</locationURI>
</link>
<link>
<name>wolfssl/internal.c</name>
<type>1</type>
<locationURI>WOLFSSL_DIR/src/internal.c</locationURI>
</link>
<link>
<name>wolfssl/io.c</name>
<name>wolfssl/wolfio.c</name>
<type>1</type>
<locationURI>WOLFSSL_DIR/src/io.c</locationURI>
<locationURI>WOLFSSL_DIR/src/wolfio.c</locationURI>
</link>
<link>
<name>wolfssl/keys.c</name>
Expand Down
6 changes: 6 additions & 0 deletions make/mt-config/mt-tls-wolfssl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ XI_TLS_LIB_NAME ?= wolfssl
XI_CONFIG_FLAGS += -DHAVE_SNI
XI_CONFIG_FLAGS += -DHAVE_CERTIFICATE_STATUS_REQUEST

# enabling ECC
XI_CONFIG_FLAGS += -DHAVE_ECC
XI_CONFIG_FLAGS += -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT -DWC_RSA_BLINDING
XI_CONFIG_FLAGS += -DWOLFSSL_X86_64_BUILD


# libxively OCSP stapling feature switch
XI_CONFIG_FLAGS += -DXI_TLS_OCSP_STAPLING
# libxively OCSP feature switch
Expand Down
31 changes: 30 additions & 1 deletion make/mt-os/mt-cc3220sf.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ else ifneq (,$(findstring Windows,$(XI_HOST_PLATFORM)))
XI_CC3220SF_PATH_CCS_TOOLS ?= C:/ti/ccsv8/tools

XI_CC3220SF_PATH_SDK ?= C:/ti/simplelink_cc32xx_sdk_2_10_00_04
XI_CC3220SF_PATH_XDC_SDK ?= C:/ti/xdctools_3_50_08_24_core
XI_CC3220SF_PATH_XDC_SDK ?= C:/ti/xdctools_3_50_05_12_core

CC = $(XI_CC3220SF_PATH_CCS_TOOLS)/compiler/$(COMPILER)/bin/armcl
AR = $(XI_CC3220SF_PATH_CCS_TOOLS)/compiler/$(COMPILER)/bin/armar
Expand Down Expand Up @@ -124,10 +124,39 @@ XI_CONFIG_FLAGS += -DXI_EMBEDDED_TESTS
XI_CONFIG_FLAGS += -DXI_DEBUG_PRINTF=Report
#XI_CONFIG_FLAGS += -DXI_CC3220SF_UNSAFELY_DISABLE_CERT_STORE #Will also disable the store's CRL


# wolfssl API

# GN: the following set of defines arguably belong in make/mt-config/mt-tls-wolfssl.mk .. not specific to cc3220
#
# note: file configuration changed due to experimentiion w/ libIOTC and integration of wSSL 3.10.7 ...
# fwiw :
# <name>wolfcrypt/ecc.c</name>
# <name>wolfcrypt/tfm.c</name>
# <name>wolfcrypt/wolfmath.c</name>
# <name>wolfssl/wolfio.c</name> ... and this one renamed from "io.c"
#
# added to wSSL .cproject:
# <listOptionValue builtIn="false" value="HAVE_ECC"/>
#
XI_CONFIG_FLAGS += -DHAVE_ECC
# re "wolfcrypt/settings.h" ... #warning directive: "For timing resistance / side-channel attack prevention consider using harden options
#XI_CONFIG_FLAGS += -DTFM_TIMING_RESISTANT # if (defined(USE_FAST_MATH)
# if (defined(HAVE_ECC)
XI_CONFIG_FLAGS += -DECC_TIMING_RESISTANT
# if (!defined(NO_RSA) && !defined(WC_RSA_BLINDING) && !defined(HAVE_FIPS) && !defined(WC_NO_RNG))
XI_CONFIG_FLAGS += -DWC_RSA_BLINDING


XI_CONFIG_FLAGS += -DNO_WRITEV
XI_CONFIG_FLAGS += -DSINGLE_THREADED

# with wolfssl 3.10.4 and later
XI_CONFIG_FLAGS += -DNO_WOLFSSL_DIR
# re "wolfssl/wolfio.h" .... fatal error #1965: cannot open source file "fcntl.h"
XI_CONFIG_FLAGS += -DWOLFSSL_USER_IO


XI_ARFLAGS := r $(XI)
XI_LIB_FLAGS := -llibxively.a

Expand Down
7 changes: 6 additions & 1 deletion src/import/tls/download_and_compile_wolfssl.sh
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,14 @@ then
echo
exit 1
fi

#
# GN: re wSSL version ... I went w/ 3.15.7
# https://github.com/wolfSSL/wolfssl/issues/1415
#
git clone https://github.com/wolfSSL/wolfssl
cd wolfssl
git checkout tags/v3.10.2-stable
git checkout tags/v3.15.7-stable
(autoreconf --install && ./configure `cat ../wolfssl.conf` && make )
echo "WolfSSL Build Complete."