diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx
index 68784e45e..add0136ee 100644
--- a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx
+++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx
@@ -598,7 +598,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
       <FilenameWithoutPath>cyassl_MDK_ARM.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -614,7 +614,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\IDE\MDK5-ARM\Src\ssl-dummy.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\IDE\MDK5-ARM\Src\ssl-dummy.c</PathWithFileName>
       <FilenameWithoutPath>ssl-dummy.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -630,7 +630,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
       <FilenameWithoutPath>aes.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -646,7 +646,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
       <FilenameWithoutPath>arc4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -662,7 +662,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
       <FilenameWithoutPath>asm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -678,7 +678,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
       <FilenameWithoutPath>asn.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -694,7 +694,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
       <FilenameWithoutPath>blake2b.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -710,7 +710,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
       <FilenameWithoutPath>camellia.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -726,7 +726,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
       <FilenameWithoutPath>coding.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -742,7 +742,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
       <FilenameWithoutPath>compress.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -758,7 +758,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
       <FilenameWithoutPath>des3.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -774,7 +774,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
       <FilenameWithoutPath>dh.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -790,7 +790,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
       <FilenameWithoutPath>dsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -806,7 +806,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
       <FilenameWithoutPath>ecc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -822,7 +822,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
       <FilenameWithoutPath>ecc_fp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -838,7 +838,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\error.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\error.c</PathWithFileName>
       <FilenameWithoutPath>error.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -854,7 +854,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
       <FilenameWithoutPath>hc128.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -870,7 +870,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
       <FilenameWithoutPath>hmac.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -886,7 +886,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
       <FilenameWithoutPath>integer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -902,7 +902,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
       <FilenameWithoutPath>logging.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -918,7 +918,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
       <FilenameWithoutPath>md2.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -934,7 +934,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
       <FilenameWithoutPath>md4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -950,7 +950,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
       <FilenameWithoutPath>md5.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -966,7 +966,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
       <FilenameWithoutPath>memory.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -982,7 +982,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
       <FilenameWithoutPath>misc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -998,7 +998,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\port.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
       <FilenameWithoutPath>port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1014,7 +1014,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
       <FilenameWithoutPath>pwdbased.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1030,7 +1030,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
       <FilenameWithoutPath>rabbit.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1046,7 +1046,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\random.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\random.c</PathWithFileName>
       <FilenameWithoutPath>random.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1062,7 +1062,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
       <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1078,7 +1078,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
       <FilenameWithoutPath>rsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1094,7 +1094,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
       <FilenameWithoutPath>sha.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1110,7 +1110,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
       <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1126,7 +1126,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
       <FilenameWithoutPath>sha512.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1142,7 +1142,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
       <FilenameWithoutPath>tfm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
diff --git a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx
index cce81092f..7f8f9d254 100644
--- a/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx
+++ b/IDE/MDK5-ARM/Projects/CryptTest/CryptTest.uvoptx
@@ -545,7 +545,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
       <FilenameWithoutPath>cyassl_MDK_ARM.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -561,7 +561,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\IDE\MDK5-ARM\Src\ssl-dummy.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\IDE\MDK5-ARM\Src\ssl-dummy.c</PathWithFileName>
       <FilenameWithoutPath>ssl-dummy.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -577,7 +577,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
       <FilenameWithoutPath>aes.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -593,7 +593,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
       <FilenameWithoutPath>arc4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -609,7 +609,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
       <FilenameWithoutPath>asm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -625,7 +625,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
       <FilenameWithoutPath>asn.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -641,7 +641,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
       <FilenameWithoutPath>blake2b.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -657,7 +657,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
       <FilenameWithoutPath>camellia.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -673,7 +673,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
       <FilenameWithoutPath>coding.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -689,7 +689,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
       <FilenameWithoutPath>compress.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -705,7 +705,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
       <FilenameWithoutPath>des3.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -721,7 +721,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
       <FilenameWithoutPath>dh.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -737,7 +737,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
       <FilenameWithoutPath>dsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -753,7 +753,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
       <FilenameWithoutPath>ecc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -769,7 +769,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
       <FilenameWithoutPath>ecc_fp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -785,7 +785,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\error.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\error.c</PathWithFileName>
       <FilenameWithoutPath>error.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -801,7 +801,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
       <FilenameWithoutPath>hc128.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -817,7 +817,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
       <FilenameWithoutPath>hmac.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -833,7 +833,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
       <FilenameWithoutPath>integer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -849,7 +849,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
       <FilenameWithoutPath>logging.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -865,7 +865,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
       <FilenameWithoutPath>md2.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -881,7 +881,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
       <FilenameWithoutPath>md4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -897,7 +897,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
       <FilenameWithoutPath>md5.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -913,7 +913,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
       <FilenameWithoutPath>memory.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -929,7 +929,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
       <FilenameWithoutPath>misc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -945,7 +945,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\port.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
       <FilenameWithoutPath>port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -961,7 +961,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
       <FilenameWithoutPath>pwdbased.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -977,7 +977,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
       <FilenameWithoutPath>rabbit.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -993,7 +993,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\random.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\random.c</PathWithFileName>
       <FilenameWithoutPath>random.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1009,7 +1009,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
       <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1025,7 +1025,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
       <FilenameWithoutPath>rsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1041,7 +1041,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
       <FilenameWithoutPath>sha.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1057,7 +1057,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
       <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1073,7 +1073,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
       <FilenameWithoutPath>sha512.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1089,7 +1089,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
       <FilenameWithoutPath>tfm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
diff --git a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx
index 2a81e58da..654abbee1 100644
--- a/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx
+++ b/IDE/MDK5-ARM/Projects/CyaSSL-Full/CyaSSL-Full.uvoptx
@@ -938,7 +938,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
       <FilenameWithoutPath>cyassl_MDK_ARM.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -954,7 +954,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
       <FilenameWithoutPath>aes.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -970,7 +970,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
       <FilenameWithoutPath>arc4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -986,7 +986,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
       <FilenameWithoutPath>asm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1002,7 +1002,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
       <FilenameWithoutPath>asn.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1018,7 +1018,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
       <FilenameWithoutPath>blake2b.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1034,7 +1034,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
       <FilenameWithoutPath>camellia.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1050,7 +1050,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
       <FilenameWithoutPath>coding.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1066,7 +1066,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
       <FilenameWithoutPath>compress.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1082,7 +1082,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
       <FilenameWithoutPath>des3.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1098,7 +1098,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
       <FilenameWithoutPath>dh.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1114,7 +1114,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
       <FilenameWithoutPath>dsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1130,7 +1130,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
       <FilenameWithoutPath>ecc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1146,7 +1146,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
       <FilenameWithoutPath>ecc_fp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1162,7 +1162,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\error.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\error.c</PathWithFileName>
       <FilenameWithoutPath>error.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1178,7 +1178,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
       <FilenameWithoutPath>hc128.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1194,7 +1194,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
       <FilenameWithoutPath>hmac.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1210,7 +1210,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
       <FilenameWithoutPath>integer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1226,7 +1226,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
       <FilenameWithoutPath>logging.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1242,7 +1242,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
       <FilenameWithoutPath>md2.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1258,7 +1258,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
       <FilenameWithoutPath>md4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1274,7 +1274,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
       <FilenameWithoutPath>md5.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1290,7 +1290,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
       <FilenameWithoutPath>memory.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1306,7 +1306,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
       <FilenameWithoutPath>misc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1322,7 +1322,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\port.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
       <FilenameWithoutPath>port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1338,7 +1338,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
       <FilenameWithoutPath>pwdbased.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1354,7 +1354,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
       <FilenameWithoutPath>rabbit.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1370,7 +1370,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\random.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\random.c</PathWithFileName>
       <FilenameWithoutPath>random.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1386,7 +1386,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
       <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1402,7 +1402,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
       <FilenameWithoutPath>rsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1418,7 +1418,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
       <FilenameWithoutPath>sha.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1434,7 +1434,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
       <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1450,7 +1450,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
       <FilenameWithoutPath>sha512.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1466,7 +1466,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
       <FilenameWithoutPath>tfm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1482,7 +1482,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\crl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\crl.c</PathWithFileName>
       <FilenameWithoutPath>crl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1498,7 +1498,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\internal.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\internal.c</PathWithFileName>
       <FilenameWithoutPath>internal.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1514,7 +1514,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\io.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\io.c</PathWithFileName>
       <FilenameWithoutPath>io.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1530,7 +1530,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\keys.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\keys.c</PathWithFileName>
       <FilenameWithoutPath>keys.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1546,7 +1546,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\ocsp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ocsp.c</PathWithFileName>
       <FilenameWithoutPath>ocsp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1562,7 +1562,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\sniffer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\sniffer.c</PathWithFileName>
       <FilenameWithoutPath>sniffer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1578,7 +1578,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\ssl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ssl.c</PathWithFileName>
       <FilenameWithoutPath>ssl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1594,7 +1594,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\tls.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\tls.c</PathWithFileName>
       <FilenameWithoutPath>tls.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
diff --git a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx
index 3d067f5b2..b4d430728 100644
--- a/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx
+++ b/IDE/MDK5-ARM/Projects/EchoClient/EchoClient.uvoptx
@@ -766,7 +766,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
       <FilenameWithoutPath>aes.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -782,7 +782,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
       <FilenameWithoutPath>arc4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -798,7 +798,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
       <FilenameWithoutPath>asm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -814,7 +814,7 @@
       <TopLine>1441</TopLine>
       <CurrentLine>1569</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
       <FilenameWithoutPath>asn.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -830,7 +830,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
       <FilenameWithoutPath>blake2b.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -846,7 +846,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
       <FilenameWithoutPath>camellia.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -862,7 +862,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
       <FilenameWithoutPath>coding.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -878,7 +878,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
       <FilenameWithoutPath>compress.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -894,7 +894,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
       <FilenameWithoutPath>des3.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -910,7 +910,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
       <FilenameWithoutPath>dh.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -926,7 +926,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
       <FilenameWithoutPath>dsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -942,7 +942,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
       <FilenameWithoutPath>ecc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -958,7 +958,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
       <FilenameWithoutPath>ecc_fp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -974,7 +974,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\error.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\error.c</PathWithFileName>
       <FilenameWithoutPath>error.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -990,7 +990,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
       <FilenameWithoutPath>hc128.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1006,7 +1006,7 @@
       <TopLine>66</TopLine>
       <CurrentLine>89</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
       <FilenameWithoutPath>hmac.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1022,7 +1022,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
       <FilenameWithoutPath>integer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1038,7 +1038,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
       <FilenameWithoutPath>logging.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1054,7 +1054,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
       <FilenameWithoutPath>md2.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1070,7 +1070,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
       <FilenameWithoutPath>md4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1086,7 +1086,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
       <FilenameWithoutPath>md5.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1102,7 +1102,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
       <FilenameWithoutPath>memory.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1118,7 +1118,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
       <FilenameWithoutPath>misc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1134,7 +1134,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
       <FilenameWithoutPath>port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1150,7 +1150,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
       <FilenameWithoutPath>pwdbased.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1166,7 +1166,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
       <FilenameWithoutPath>rabbit.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1182,7 +1182,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\random.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\random.c</PathWithFileName>
       <FilenameWithoutPath>random.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1198,7 +1198,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
       <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1214,7 +1214,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
       <FilenameWithoutPath>rsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1230,7 +1230,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
       <FilenameWithoutPath>sha.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1246,7 +1246,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
       <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1262,7 +1262,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
       <FilenameWithoutPath>sha512.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1278,7 +1278,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
       <FilenameWithoutPath>tfm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1294,7 +1294,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\crl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\crl.c</PathWithFileName>
       <FilenameWithoutPath>crl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1310,7 +1310,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\internal.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\internal.c</PathWithFileName>
       <FilenameWithoutPath>internal.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1326,7 +1326,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\io.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\io.c</PathWithFileName>
       <FilenameWithoutPath>io.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1342,7 +1342,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\keys.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\keys.c</PathWithFileName>
       <FilenameWithoutPath>keys.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1358,7 +1358,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\ocsp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ocsp.c</PathWithFileName>
       <FilenameWithoutPath>ocsp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1374,7 +1374,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\sniffer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\sniffer.c</PathWithFileName>
       <FilenameWithoutPath>sniffer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1390,7 +1390,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\ssl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ssl.c</PathWithFileName>
       <FilenameWithoutPath>ssl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1406,7 +1406,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\tls.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\tls.c</PathWithFileName>
       <FilenameWithoutPath>tls.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1438,7 +1438,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
       <FilenameWithoutPath>cyassl_MDK_ARM.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
diff --git a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx
index 82c03fd26..acb14f19b 100644
--- a/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx
+++ b/IDE/MDK5-ARM/Projects/EchoServer/EchoServer.uvoptx
@@ -766,7 +766,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
       <FilenameWithoutPath>aes.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -782,7 +782,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
       <FilenameWithoutPath>arc4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -798,7 +798,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
       <FilenameWithoutPath>asm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -814,7 +814,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
       <FilenameWithoutPath>asn.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -830,7 +830,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
       <FilenameWithoutPath>blake2b.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -846,7 +846,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
       <FilenameWithoutPath>camellia.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -862,7 +862,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
       <FilenameWithoutPath>coding.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -878,7 +878,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
       <FilenameWithoutPath>compress.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -894,7 +894,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
       <FilenameWithoutPath>des3.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -910,7 +910,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
       <FilenameWithoutPath>dh.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -926,7 +926,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
       <FilenameWithoutPath>dsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -942,7 +942,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
       <FilenameWithoutPath>ecc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -958,7 +958,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
       <FilenameWithoutPath>ecc_fp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -974,7 +974,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\error.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\error.c</PathWithFileName>
       <FilenameWithoutPath>error.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -990,7 +990,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
       <FilenameWithoutPath>hc128.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1006,7 +1006,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
       <FilenameWithoutPath>hmac.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1022,7 +1022,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
       <FilenameWithoutPath>integer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1038,7 +1038,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
       <FilenameWithoutPath>logging.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1054,7 +1054,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
       <FilenameWithoutPath>md2.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1070,7 +1070,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
       <FilenameWithoutPath>md4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1086,7 +1086,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
       <FilenameWithoutPath>md5.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1102,7 +1102,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
       <FilenameWithoutPath>memory.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1118,7 +1118,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
       <FilenameWithoutPath>misc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1134,7 +1134,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
       <FilenameWithoutPath>port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1150,7 +1150,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
       <FilenameWithoutPath>pwdbased.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1166,7 +1166,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
       <FilenameWithoutPath>rabbit.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1182,7 +1182,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\random.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\random.c</PathWithFileName>
       <FilenameWithoutPath>random.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1198,7 +1198,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
       <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1214,7 +1214,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
       <FilenameWithoutPath>rsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1230,7 +1230,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
       <FilenameWithoutPath>sha.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1246,7 +1246,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
       <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1262,7 +1262,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
       <FilenameWithoutPath>sha512.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1278,7 +1278,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
       <FilenameWithoutPath>tfm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1294,7 +1294,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\crl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\crl.c</PathWithFileName>
       <FilenameWithoutPath>crl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1310,7 +1310,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\internal.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\internal.c</PathWithFileName>
       <FilenameWithoutPath>internal.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1326,7 +1326,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\io.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\io.c</PathWithFileName>
       <FilenameWithoutPath>io.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1342,7 +1342,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\keys.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\keys.c</PathWithFileName>
       <FilenameWithoutPath>keys.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1358,7 +1358,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\ocsp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ocsp.c</PathWithFileName>
       <FilenameWithoutPath>ocsp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1374,7 +1374,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\sniffer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\sniffer.c</PathWithFileName>
       <FilenameWithoutPath>sniffer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1390,7 +1390,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\ssl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ssl.c</PathWithFileName>
       <FilenameWithoutPath>ssl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1406,7 +1406,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\src\tls.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\tls.c</PathWithFileName>
       <FilenameWithoutPath>tls.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1438,7 +1438,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.0\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
       <FilenameWithoutPath>cyassl_MDK_ARM.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
diff --git a/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx b/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx
index bf7360917..4b0a68d67 100644
--- a/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx
+++ b/IDE/MDK5-ARM/Projects/SimpleClient/SimpleClient.uvoptx
@@ -814,7 +814,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
       <FilenameWithoutPath>cyassl_MDK_ARM.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -830,7 +830,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
       <FilenameWithoutPath>aes.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -846,7 +846,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
       <FilenameWithoutPath>arc4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -862,7 +862,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
       <FilenameWithoutPath>asm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -878,7 +878,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
       <FilenameWithoutPath>asn.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -894,7 +894,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
       <FilenameWithoutPath>blake2b.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -910,7 +910,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
       <FilenameWithoutPath>camellia.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -926,7 +926,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
       <FilenameWithoutPath>coding.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -942,7 +942,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
       <FilenameWithoutPath>compress.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -958,7 +958,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
       <FilenameWithoutPath>des3.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -974,7 +974,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
       <FilenameWithoutPath>dh.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -990,7 +990,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
       <FilenameWithoutPath>dsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1006,7 +1006,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
       <FilenameWithoutPath>ecc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1022,7 +1022,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
       <FilenameWithoutPath>ecc_fp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1038,7 +1038,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\error.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\error.c</PathWithFileName>
       <FilenameWithoutPath>error.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1054,7 +1054,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
       <FilenameWithoutPath>hc128.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1070,7 +1070,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
       <FilenameWithoutPath>hmac.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1086,7 +1086,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
       <FilenameWithoutPath>integer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1102,7 +1102,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
       <FilenameWithoutPath>logging.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1118,7 +1118,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
       <FilenameWithoutPath>md2.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1134,7 +1134,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
       <FilenameWithoutPath>md4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1150,7 +1150,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
       <FilenameWithoutPath>md5.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1166,7 +1166,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
       <FilenameWithoutPath>memory.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1182,7 +1182,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
       <FilenameWithoutPath>misc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1198,7 +1198,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\port.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
       <FilenameWithoutPath>port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1214,7 +1214,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
       <FilenameWithoutPath>pwdbased.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1230,7 +1230,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
       <FilenameWithoutPath>rabbit.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1246,7 +1246,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\random.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\random.c</PathWithFileName>
       <FilenameWithoutPath>random.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1262,7 +1262,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
       <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1278,7 +1278,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
       <FilenameWithoutPath>rsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1294,7 +1294,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
       <FilenameWithoutPath>sha.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1310,7 +1310,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
       <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1326,7 +1326,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
       <FilenameWithoutPath>sha512.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1342,7 +1342,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
       <FilenameWithoutPath>tfm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1358,7 +1358,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\crl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\crl.c</PathWithFileName>
       <FilenameWithoutPath>crl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1374,7 +1374,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\internal.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\internal.c</PathWithFileName>
       <FilenameWithoutPath>internal.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1390,7 +1390,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\io.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\io.c</PathWithFileName>
       <FilenameWithoutPath>io.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1406,7 +1406,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\keys.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\keys.c</PathWithFileName>
       <FilenameWithoutPath>keys.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1422,7 +1422,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\ocsp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ocsp.c</PathWithFileName>
       <FilenameWithoutPath>ocsp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1438,7 +1438,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\sniffer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\sniffer.c</PathWithFileName>
       <FilenameWithoutPath>sniffer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1454,7 +1454,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\ssl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ssl.c</PathWithFileName>
       <FilenameWithoutPath>ssl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1470,7 +1470,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.4\cyassl\src\tls.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\tls.c</PathWithFileName>
       <FilenameWithoutPath>tls.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
diff --git a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx
index 0fd7be198..a83830746 100644
--- a/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx
+++ b/IDE/MDK5-ARM/Projects/SimpleServer/SimpleServer.uvoptx
@@ -798,7 +798,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\IDE\MDK5-ARM\Src\cyassl_MDK_ARM.c</PathWithFileName>
       <FilenameWithoutPath>cyassl_MDK_ARM.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -814,7 +814,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\aes.c</PathWithFileName>
       <FilenameWithoutPath>aes.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -830,7 +830,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\arc4.c</PathWithFileName>
       <FilenameWithoutPath>arc4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -846,7 +846,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asm.c</PathWithFileName>
       <FilenameWithoutPath>asm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -862,7 +862,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\asn.c</PathWithFileName>
       <FilenameWithoutPath>asn.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -878,7 +878,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\blake2b.c</PathWithFileName>
       <FilenameWithoutPath>blake2b.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -894,7 +894,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\camellia.c</PathWithFileName>
       <FilenameWithoutPath>camellia.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -910,7 +910,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\coding.c</PathWithFileName>
       <FilenameWithoutPath>coding.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -926,7 +926,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\compress.c</PathWithFileName>
       <FilenameWithoutPath>compress.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -942,7 +942,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\des3.c</PathWithFileName>
       <FilenameWithoutPath>des3.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -958,7 +958,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dh.c</PathWithFileName>
       <FilenameWithoutPath>dh.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -974,7 +974,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\dsa.c</PathWithFileName>
       <FilenameWithoutPath>dsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -990,7 +990,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc.c</PathWithFileName>
       <FilenameWithoutPath>ecc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1006,7 +1006,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ecc_fp.c</PathWithFileName>
       <FilenameWithoutPath>ecc_fp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1022,7 +1022,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\error.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\error.c</PathWithFileName>
       <FilenameWithoutPath>error.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1038,7 +1038,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hc128.c</PathWithFileName>
       <FilenameWithoutPath>hc128.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1054,7 +1054,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\hmac.c</PathWithFileName>
       <FilenameWithoutPath>hmac.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1070,7 +1070,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\integer.c</PathWithFileName>
       <FilenameWithoutPath>integer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1086,7 +1086,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\logging.c</PathWithFileName>
       <FilenameWithoutPath>logging.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1102,7 +1102,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md2.c</PathWithFileName>
       <FilenameWithoutPath>md2.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1118,7 +1118,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md4.c</PathWithFileName>
       <FilenameWithoutPath>md4.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1134,7 +1134,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\md5.c</PathWithFileName>
       <FilenameWithoutPath>md5.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1150,7 +1150,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\memory.c</PathWithFileName>
       <FilenameWithoutPath>memory.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1166,7 +1166,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\misc.c</PathWithFileName>
       <FilenameWithoutPath>misc.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1182,7 +1182,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\port.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\port.c</PathWithFileName>
       <FilenameWithoutPath>port.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1198,7 +1198,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\pwdbased.c</PathWithFileName>
       <FilenameWithoutPath>pwdbased.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1214,7 +1214,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rabbit.c</PathWithFileName>
       <FilenameWithoutPath>rabbit.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1230,7 +1230,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\random.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\random.c</PathWithFileName>
       <FilenameWithoutPath>random.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1246,7 +1246,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\ripemd.c</PathWithFileName>
       <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1262,7 +1262,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\rsa.c</PathWithFileName>
       <FilenameWithoutPath>rsa.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1278,7 +1278,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha.c</PathWithFileName>
       <FilenameWithoutPath>sha.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1294,7 +1294,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha256.c</PathWithFileName>
       <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1310,7 +1310,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\sha512.c</PathWithFileName>
       <FilenameWithoutPath>sha512.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1326,7 +1326,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\ctaocrypt\src\tfm.c</PathWithFileName>
       <FilenameWithoutPath>tfm.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1342,7 +1342,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\src\crl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\crl.c</PathWithFileName>
       <FilenameWithoutPath>crl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1358,7 +1358,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\src\internal.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\internal.c</PathWithFileName>
       <FilenameWithoutPath>internal.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1374,7 +1374,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\src\io.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\io.c</PathWithFileName>
       <FilenameWithoutPath>io.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1390,7 +1390,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\src\keys.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\keys.c</PathWithFileName>
       <FilenameWithoutPath>keys.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1406,7 +1406,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\src\ocsp.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ocsp.c</PathWithFileName>
       <FilenameWithoutPath>ocsp.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1422,7 +1422,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\src\sniffer.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\sniffer.c</PathWithFileName>
       <FilenameWithoutPath>sniffer.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1438,7 +1438,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\src\ssl.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\ssl.c</PathWithFileName>
       <FilenameWithoutPath>ssl.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>
@@ -1454,7 +1454,7 @@
       <TopLine>0</TopLine>
       <CurrentLine>0</CurrentLine>
       <bDave2>0</bDave2>
-      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\2.9.1\cyassl\src\tls.c</PathWithFileName>
+      <PathWithFileName>C:\Keil5\ARM\PACK\wolfSSL\CyaSSL\3.0.0\cyassl\src\tls.c</PathWithFileName>
       <FilenameWithoutPath>tls.c</FilenameWithoutPath>
       <RteFlg>1</RteFlg>
       <bShared>0</bShared>