From 7e13e414cbf322b6df74380befe687cea75215cb Mon Sep 17 00:00:00 2001 From: Chris Conlon Date: Wed, 28 May 2014 10:28:01 -0600 Subject: [PATCH 1/2] rename port.c/.h to wc_port.c/.h to prevent FreeRTOS conflicts --- IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp | 2 +- IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt | 4 ++-- IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj | 12 ++++++------ IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt | 4 ++-- IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj | 12 ++++++------ .../Projects/CryptBenchmark/CryptBenchmark.uvoptx | 4 ++-- .../Projects/CryptBenchmark/CryptBenchmark.uvprojx | 4 ++-- IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx | 4 ++-- IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx | 4 ++-- IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx | 4 ++-- .../Projects/CyaSSL-Full/CyaSSL-Full.uvprojx | 4 ++-- IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx | 4 ++-- IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx | 4 ++-- IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx | 4 ++-- IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx | 4 ++-- .../Projects/SimpleClient/SimpleClient.uvoptx | 4 ++-- .../Projects/SimpleClient/simpleClient.uvprojx | 4 ++-- .../Projects/SimpleServer/SimpleServer.uvoptx | 4 ++-- .../Projects/SimpleServer/SimpleServer.uvprojx | 4 ++-- ctaocrypt/ctaocrypt.vcproj | 2 +- ctaocrypt/src/{port.c => wc_port.c} | 0 cyassl-ntru.vcproj | 2 +- cyassl.vcproj | 2 +- cyassl.vcxproj | 4 ++-- cyassl/ctaocrypt/include.am | 2 +- cyassl/ctaocrypt/types.h | 2 +- cyassl/ctaocrypt/{port.h => wc_port.h} | 0 mcapi/cyassl.X/nbproject/configurations.xml | 2 +- mplabx/cyassl.X/nbproject/configurations.xml | 4 ++-- rpm/spec.in | 2 +- src/include.am | 2 +- 31 files changed, 57 insertions(+), 57 deletions(-) rename ctaocrypt/src/{port.c => wc_port.c} (100%) rename cyassl/ctaocrypt/{port.h => wc_port.h} (100%) diff --git a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp index 8602d4e66..bc278a468 100644 --- a/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp +++ b/IDE/IAR-EWARM/Projects/CyaSSL-Lib/CyaSSL-Lib.ewp @@ -1965,7 +1965,7 @@ $PROJ_DIR$\..\..\..\..\ctaocrypt\src\misc.c - $PROJ_DIR$\..\..\..\..\ctaocrypt\src\port.c + $PROJ_DIR$\..\..\..\..\ctaocrypt\src\wc_port.c $PROJ_DIR$\..\..\..\..\ctaocrypt\src\pwdbased.c diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt b/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt index 4814980e2..1e83de18e 100644 --- a/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt +++ b/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvopt @@ -1539,8 +1539,8 @@ 0 0 0 - ..\..\..\ctaocrypt\src\port.c - port.c + ..\..\..\ctaocrypt\src\wc_port.c + wc_port.c 0 0 diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj b/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj index eefd970ea..6504d782a 100644 --- a/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj +++ b/IDE/MDK-ARM/Projects/MDK-ARM-LPC43xx.uvproj @@ -726,9 +726,9 @@ ..\..\..\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - ..\..\..\ctaocrypt\src\port.c + ..\..\..\ctaocrypt\src\wc_port.c pwdbased.c @@ -1970,9 +1970,9 @@ - port.c + wc_port.c 1 - ..\..\..\ctaocrypt\src\port.c + ..\..\..\ctaocrypt\src\wc_port.c @@ -3267,9 +3267,9 @@ - port.c + wc_port.c 1 - ..\..\..\ctaocrypt\src\port.c + ..\..\..\ctaocrypt\src\wc_port.c diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt index ddc1a5000..f051310b2 100644 --- a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt +++ b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt @@ -1294,8 +1294,8 @@ 0 0 0 - ..\..\..\ctaocrypt\src\port.c - port.c + ..\..\..\ctaocrypt\src\wc_port.c + wc_port.c 0 0 diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj index 833dc0d1b..f7cf9b176 100644 --- a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj +++ b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj @@ -704,9 +704,9 @@ ..\..\..\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - ..\..\..\ctaocrypt\src\port.c + ..\..\..\ctaocrypt\src\wc_port.c pwdbased.c @@ -2121,9 +2121,9 @@ ..\..\..\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - ..\..\..\ctaocrypt\src\port.c + ..\..\..\ctaocrypt\src\wc_port.c pwdbased.c @@ -3636,9 +3636,9 @@ ..\..\..\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - ..\..\..\ctaocrypt\src\port.c + ..\..\..\ctaocrypt\src\wc_port.c pwdbased.c diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx index d5106490f..4217560bf 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx @@ -1015,8 +1015,8 @@ 0 0 0 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c - port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c + wc_port.c 1 0 diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx index 47b0e21aa..6382ff2c5 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx @@ -670,9 +670,9 @@ C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c pwdbased.c diff --git a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx index 0f4bcddf2..3d3905ab1 100644 --- a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx +++ b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx @@ -977,8 +977,8 @@ 0 0 0 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c - port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c + wc_port.c 1 0 diff --git a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx index 89b16583d..2f9123d53 100644 --- a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx +++ b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvprojx @@ -660,9 +660,9 @@ C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c pwdbased.c diff --git a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx index 714391aa7..ab0d90db3 100644 --- a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx +++ b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx @@ -1339,8 +1339,8 @@ 0 0 0 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c - port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c + wc_port.c 1 0 diff --git a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx index 9f4bea3a6..dc54ce825 100644 --- a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx +++ b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvprojx @@ -770,9 +770,9 @@ C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c pwdbased.c diff --git a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx index 903ee3cac..d00990d89 100644 --- a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx +++ b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx @@ -1151,8 +1151,8 @@ 0 0 0 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c - port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c + wc_port.c 1 0 diff --git a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx index 9083e5569..67ac6f0b2 100644 --- a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx +++ b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvprojx @@ -715,9 +715,9 @@ C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c pwdbased.c diff --git a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx index 242215bf9..3f4dfdad1 100644 --- a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx +++ b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx @@ -1151,8 +1151,8 @@ 0 0 0 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c - port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c + wc_port.c 1 0 diff --git a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx index 0c2c83673..76471d0ae 100644 --- a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx +++ b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvprojx @@ -715,9 +715,9 @@ C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c pwdbased.c diff --git a/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx b/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx index bdd17d798..2ac3a7211 100644 --- a/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx +++ b/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx @@ -1215,8 +1215,8 @@ 0 0 0 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c - port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c + wc_port.c 1 0 diff --git a/IDE/MDK5-ARM/Projects/SimpleClient/simpleClient.uvprojx b/IDE/MDK5-ARM/Projects/SimpleClient/simpleClient.uvprojx index efee3c0c8..4cc8e2149 100644 --- a/IDE/MDK5-ARM/Projects/SimpleClient/simpleClient.uvprojx +++ b/IDE/MDK5-ARM/Projects/SimpleClient/simpleClient.uvprojx @@ -735,9 +735,9 @@ C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c pwdbased.c diff --git a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx index dcd3ae74a..c667014f0 100644 --- a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx +++ b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx @@ -1199,8 +1199,8 @@ 0 0 0 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c - port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c + wc_port.c 1 0 diff --git a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvprojx b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvprojx index 156a9906d..77f3f876f 100644 --- a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvprojx +++ b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvprojx @@ -730,9 +730,9 @@ C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c - port.c + wc_port.c 1 - C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c + C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\wc_port.c pwdbased.c diff --git a/ctaocrypt/ctaocrypt.vcproj b/ctaocrypt/ctaocrypt.vcproj index 2ae9046d5..d07147d57 100755 --- a/ctaocrypt/ctaocrypt.vcproj +++ b/ctaocrypt/ctaocrypt.vcproj @@ -297,7 +297,7 @@ > - + @@ -179,4 +179,4 @@ - \ No newline at end of file + diff --git a/cyassl/ctaocrypt/include.am b/cyassl/ctaocrypt/include.am index 8165af42c..b3cf210a4 100644 --- a/cyassl/ctaocrypt/include.am +++ b/cyassl/ctaocrypt/include.am @@ -23,7 +23,7 @@ nobase_include_HEADERS+= \ cyassl/ctaocrypt/md5.h \ cyassl/ctaocrypt/misc.h \ cyassl/ctaocrypt/pkcs7.h \ - cyassl/ctaocrypt/port.h \ + cyassl/ctaocrypt/wc_port.h \ cyassl/ctaocrypt/pwdbased.h \ cyassl/ctaocrypt/rabbit.h \ cyassl/ctaocrypt/random.h \ diff --git a/cyassl/ctaocrypt/types.h b/cyassl/ctaocrypt/types.h index 194b50b76..33cdb780e 100644 --- a/cyassl/ctaocrypt/types.h +++ b/cyassl/ctaocrypt/types.h @@ -24,7 +24,7 @@ #define CTAO_CRYPT_TYPES_H #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/cyassl/ctaocrypt/port.h b/cyassl/ctaocrypt/wc_port.h similarity index 100% rename from cyassl/ctaocrypt/port.h rename to cyassl/ctaocrypt/wc_port.h diff --git a/mcapi/cyassl.X/nbproject/configurations.xml b/mcapi/cyassl.X/nbproject/configurations.xml index 7837eed08..8eafc4c55 100644 --- a/mcapi/cyassl.X/nbproject/configurations.xml +++ b/mcapi/cyassl.X/nbproject/configurations.xml @@ -52,7 +52,7 @@ ../../mcapi/crypto.c ../../ctaocrypt/src/compress.c ../../ctaocrypt/src/camellia.c - ../../ctaocrypt/src/port.c + ../../ctaocrypt/src/wc_port.c ../../ctaocrypt/src/sha256.c ../../ctaocrypt/src/sha512.c ../../ctaocrypt/src/tfm.c - ../../ctaocrypt/src/port.c + ../../ctaocrypt/src/wc_port.c PKOBSKDEPlatformTool XC32 - 1.30 + 1.10 3 diff --git a/rpm/spec.in b/rpm/spec.in index 97d8e5722..9435c6cfa 100644 --- a/rpm/spec.in +++ b/rpm/spec.in @@ -106,7 +106,7 @@ mkdir -p $RPM_BUILD_ROOT/ %{_includedir}/cyassl/ctaocrypt/mpi_class.h %{_includedir}/cyassl/ctaocrypt/mpi_superclass.h %{_includedir}/cyassl/ctaocrypt/pkcs7.h -%{_includedir}/cyassl/ctaocrypt/port.h +%{_includedir}/cyassl/ctaocrypt/wc_port.h %{_includedir}/cyassl/ctaocrypt/pwdbased.h %{_includedir}/cyassl/ctaocrypt/rabbit.h %{_includedir}/cyassl/ctaocrypt/random.h diff --git a/src/include.am b/src/include.am index ba5010588..d4a32684b 100644 --- a/src/include.am +++ b/src/include.am @@ -19,7 +19,7 @@ src_libcyassl_la_SOURCES += \ ctaocrypt/src/random.c \ ctaocrypt/src/sha256.c \ ctaocrypt/src/logging.c \ - ctaocrypt/src/port.c \ + ctaocrypt/src/wc_port.c \ ctaocrypt/src/error.c src_libcyassl_la_LDFLAGS = ${AM_LDFLAGS} -no-undefined -version-info ${CYASSL_LIBRARY_VERSION} src_libcyassl_la_LIBADD = $(LIBM) From fe88e925cd842292ecf92648a67019e2321c0f63 Mon Sep 17 00:00:00 2001 From: Chris Conlon Date: Wed, 28 May 2014 10:30:47 -0600 Subject: [PATCH 2/2] update MPLABX generated project files, formatting --- mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml | 2 +- mplabx/ctaocrypt_benchmark.X/nbproject/project.xml | 4 +++- mplabx/ctaocrypt_test.X/nbproject/configurations.xml | 2 +- mplabx/ctaocrypt_test.X/nbproject/project.xml | 4 +++- mplabx/cyassl.X/nbproject/project.xml | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml b/mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml index 13faa6bc4..89dad9242 100644 --- a/mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml +++ b/mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml @@ -34,7 +34,7 @@ PKOBSKDEPlatformTool XC32 - 1.30 + 1.10 3 diff --git a/mplabx/ctaocrypt_benchmark.X/nbproject/project.xml b/mplabx/ctaocrypt_benchmark.X/nbproject/project.xml index e87963a96..131e4cf97 100644 --- a/mplabx/ctaocrypt_benchmark.X/nbproject/project.xml +++ b/mplabx/ctaocrypt_benchmark.X/nbproject/project.xml @@ -1,4 +1,5 @@ - + + com.microchip.mplab.nbide.embedded.makeproject @@ -9,6 +10,7 @@ ISO-8859-1 + ../cyassl.X diff --git a/mplabx/ctaocrypt_test.X/nbproject/configurations.xml b/mplabx/ctaocrypt_test.X/nbproject/configurations.xml index 7ffe44c26..284040b81 100644 --- a/mplabx/ctaocrypt_test.X/nbproject/configurations.xml +++ b/mplabx/ctaocrypt_test.X/nbproject/configurations.xml @@ -35,7 +35,7 @@ PKOBSKDEPlatformTool XC32 - 1.30 + 1.10 3 diff --git a/mplabx/ctaocrypt_test.X/nbproject/project.xml b/mplabx/ctaocrypt_test.X/nbproject/project.xml index 82180e826..1f0921a97 100644 --- a/mplabx/ctaocrypt_test.X/nbproject/project.xml +++ b/mplabx/ctaocrypt_test.X/nbproject/project.xml @@ -1,4 +1,5 @@ - + + com.microchip.mplab.nbide.embedded.makeproject @@ -9,6 +10,7 @@ h ISO-8859-1 + ../cyassl.X diff --git a/mplabx/cyassl.X/nbproject/project.xml b/mplabx/cyassl.X/nbproject/project.xml index c7604d711..a3711bf2d 100644 --- a/mplabx/cyassl.X/nbproject/project.xml +++ b/mplabx/cyassl.X/nbproject/project.xml @@ -1,4 +1,5 @@ - + + com.microchip.mplab.nbide.embedded.makeproject @@ -9,6 +10,7 @@ ISO-8859-1 +