rename the file io.h to wolfio.h

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

@@ -2056,7 +2056,7 @@
       <name>$PROJ_DIR$\..\..\..\..\src\internal.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\..\..\src\io.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\src\wolfio.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\src\keys.c</name>

IDE/INTIME-RTOS/libwolfssl.vcxproj

@@ -17,7 +17,7 @@
     <ClCompile Include="libwolfssl.c" />
     <ClCompile Include="..\..\src\crl.c" />
     <ClCompile Include="..\..\src\internal.c" />
-    <ClCompile Include="..\..\src\io.c" />
+    <ClCompile Include="..\..\src\wolfio.c" />
     <ClCompile Include="..\..\src\keys.c" />
     <ClCompile Include="..\..\src\ocsp.c" />
     <ClCompile Include="..\..\src\sniffer.c" />

IDE/LINUX-SGX/sgx_t_static.mk

@@ -64,7 +64,7 @@ Wolfssl_C_Files :=$(WOLFSSL_ROOT)/wolfcrypt/src/aes.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/hmac.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/integer.c\
 					$(WOLFSSL_ROOT)/src/internal.c\
-					$(WOLFSSL_ROOT)/src/io.c\
+					$(WOLFSSL_ROOT)/src/wolfio.c\
 					$(WOLFSSL_ROOT)/src/keys.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/logging.c\
 					$(WOLFSSL_ROOT)/wolfcrypt/src/md4.c\

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

@@ -1223,8 +1223,8 @@
       <Focus>0</Focus>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\src\io.c</PathWithFileName>
-      <FilenameWithoutPath>io.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\src\wolfio.c</PathWithFileName>
+      <FilenameWithoutPath>wolfio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>

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

@@ -657,9 +657,9 @@
               <FilePath>..\..\..\src\internal.c</FilePath>
             </File>
             <File>
-              <FileName>io.c</FileName>
+              <FileName>wolfio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\src\io.c</FilePath>
+              <FilePath>..\..\..\src\wolfio.c</FilePath>
             </File>
             <File>
               <FileName>keys.c</FileName>
@@ -1366,9 +1366,9 @@
               <FilePath>..\..\..\src\internal.c</FilePath>
             </File>
             <File>
-              <FileName>io.c</FileName>
+              <FileName>wolfio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\src\io.c</FilePath>
+              <FilePath>..\..\..\src\wolfio.c</FilePath>
             </File>
             <File>
               <FileName>keys.c</FileName>
@@ -2075,9 +2075,9 @@
               <FilePath>..\..\..\src\internal.c</FilePath>
             </File>
             <File>
-              <FileName>io.c</FileName>
+              <FileName>wolfio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\src\io.c</FilePath>
+              <FilePath>..\..\..\src\wolfio.c</FilePath>
             </File>
             <File>
               <FileName>keys.c</FileName>

IDE/MYSQL/CMakeLists_wolfSSL.txt

@@ -31,7 +31,7 @@ ADD_DEFINITIONS(-Dget_tty_password_ext=wolfssl_mysql_get_tty_password_ext)
 ADD_DEFINITIONS(-Dget_tty_password=wolfssl_mysql_get_tty_password)
 
 SET(WOLFSSL_SOURCES  src/crl.c src/internal.c src/keys.c src/sniffer.c
-        src/tls.c src/io.c src/ocsp.c src/ssl.c
+        src/tls.c src/wolfio.c src/ocsp.c src/ssl.c
                                 ../../client/get_password.c )
 
 ADD_CONVENIENCE_LIBRARY(wolfssl ${WOLFSSL_SOURCES})

IDE/OPENSTM32/.project

@@ -81,9 +81,9 @@
 			<locationURI>PARENT-2-PROJECT_LOC/src/internal.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/wolfSSL/src/io.c</name>
+			<name>Middlewares/Third_Party/wolfSSL/src/wolfio.c</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/src/io.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/src/wolfio.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/Third_Party/wolfSSL/src/keys.c</name>
@@ -211,9 +211,9 @@
 			<locationURI>PARENT-2-PROJECT_LOC/wolfssl/internal.h</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/wolfSSL/wolfssl/io.h</name>
+			<name>Middlewares/Third_Party/wolfSSL/wolfssl/wolfio.h</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/wolfssl/io.h</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/wolfssl/wolfio.h</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/Third_Party/wolfSSL/wolfssl/ocsp.h</name>

IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp

@@ -129,7 +129,7 @@
         <file file_name="../../src/crl.c" />
         <file file_name="../../src/include.am" />
         <file file_name="../../src/internal.c" />
-        <file file_name="../../src/io.c" />
+        <file file_name="../../src/wolfio.c" />
         <file file_name="../../src/keys.c" />
         <file file_name="../../src/libwolfssl.la" />
         <file file_name="../../src/ocsp.c" />

IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp

@@ -307,7 +307,7 @@
         <file file_name="../../src/crl.c" />
         <file file_name="../../src/include.am" />
         <file file_name="../../src/internal.c" />
-        <file file_name="../../src/io.c" />
+        <file file_name="../../src/wolfio.c" />
         <file file_name="../../src/keys.c" />
         <file file_name="../../src/libwolfssl.la" />
         <file file_name="../../src/ocsp.c" />

IDE/WIN/wolfssl-fips.vcxproj

@@ -290,7 +290,7 @@
     <ClCompile Include="..\..\wolfcrypt\src\hmac.c" />
     <ClCompile Include="..\..\wolfcrypt\src\integer.c" />
     <ClCompile Include="..\..\src\internal.c" />
-    <ClCompile Include="..\..\src\io.c" />
+    <ClCompile Include="..\..\src\wolfio.c" />
     <ClCompile Include="..\..\src\keys.c" />
     <ClCompile Include="..\..\wolfcrypt\src\logging.c" />
     <ClCompile Include="..\..\wolfcrypt\src\md5.c" />

IDE/iOS/wolfssl-FIPS.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		521646091A89928E0062516A /* crl.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646011A89928E0062516A /* crl.c */; };
 		5216460A1A89928E0062516A /* internal.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646021A89928E0062516A /* internal.c */; };
-		5216460B1A89928E0062516A /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646031A89928E0062516A /* io.c */; };
+		5216460B1A89928E0062516A /* wolfio.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646031A89928E0062516A /* wolfio.c */; };
 		5216460C1A89928E0062516A /* keys.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646041A89928E0062516A /* keys.c */; };
 		5216460D1A89928E0062516A /* ocsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646051A89928E0062516A /* ocsp.c */; };
 		5216460E1A89928E0062516A /* sniffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646061A89928E0062516A /* sniffer.c */; };
@@ -220,7 +220,7 @@
 		A4A54E271BC5C3E0002866CD /* arc4.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646121A8992CC0062516A /* arc4.c */; };
 		A4A54E281BC5C3E0002866CD /* integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 5216461F1A8992CC0062516A /* integer.c */; };
 		A4A54E291BC5C3E0002866CD /* internal.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646021A89928E0062516A /* internal.c */; };
-		A4A54E2A1BC5C3E0002866CD /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646031A89928E0062516A /* io.c */; };
+		A4A54E2A1BC5C3E0002866CD /* wolfio.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646031A89928E0062516A /* wolfio.c */; };
 		A4A54E2B1BC5C3E0002866CD /* tfm.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646301A8992CC0062516A /* tfm.c */; };
 		A4A54E2C1BC5C3E0002866CD /* crl.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646011A89928E0062516A /* crl.c */; };
 		A4A54E2D1BC5C3E0002866CD /* keys.c in Sources */ = {isa = PBXBuildFile; fileRef = 521646041A89928E0062516A /* keys.c */; };
@@ -625,7 +625,7 @@
 /* Begin PBXFileReference section */
 		521646011A89928E0062516A /* crl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = crl.c; path = ../../src/crl.c; sourceTree = "<group>"; };
 		521646021A89928E0062516A /* internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = internal.c; path = ../../src/internal.c; sourceTree = "<group>"; };
-		521646031A89928E0062516A /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io.c; path = ../../src/io.c; sourceTree = "<group>"; };
+		521646031A89928E0062516A /* wolfio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = wolfio.c; path = ../../src/wolfio.c; sourceTree = "<group>"; };
 		521646041A89928E0062516A /* keys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = keys.c; path = ../../src/keys.c; sourceTree = "<group>"; };
 		521646051A89928E0062516A /* ocsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ocsp.c; path = ../../src/ocsp.c; sourceTree = "<group>"; };
 		521646061A89928E0062516A /* sniffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sniffer.c; path = ../../src/sniffer.c; sourceTree = "<group>"; };
@@ -1012,7 +1012,7 @@
 			children = (
 				521646011A89928E0062516A /* crl.c */,
 				521646021A89928E0062516A /* internal.c */,
-				521646031A89928E0062516A /* io.c */,
+				521646031A89928E0062516A /* wolfio.c */,
 				521646041A89928E0062516A /* keys.c */,
 				521646051A89928E0062516A /* ocsp.c */,
 				521646061A89928E0062516A /* sniffer.c */,
@@ -1185,7 +1185,7 @@
 				521646331A8992CC0062516A /* arc4.c in Sources */,
 				521646401A8992CC0062516A /* integer.c in Sources */,
 				5216460A1A89928E0062516A /* internal.c in Sources */,
-				5216460B1A89928E0062516A /* io.c in Sources */,
+				5216460B1A89928E0062516A /* wolfio.c in Sources */,
 				521646511A8992CC0062516A /* tfm.c in Sources */,
 				521646091A89928E0062516A /* crl.c in Sources */,
 				5216460C1A89928E0062516A /* keys.c in Sources */,
@@ -1247,7 +1247,7 @@
 				A4A54E271BC5C3E0002866CD /* arc4.c in Sources */,
 				A4A54E281BC5C3E0002866CD /* integer.c in Sources */,
 				A4A54E291BC5C3E0002866CD /* internal.c in Sources */,
-				A4A54E2A1BC5C3E0002866CD /* io.c in Sources */,
+				A4A54E2A1BC5C3E0002866CD /* wolfio.c in Sources */,
 				A4A54E2B1BC5C3E0002866CD /* tfm.c in Sources */,
 				A4A54E2C1BC5C3E0002866CD /* crl.c in Sources */,
 				A4A54E2D1BC5C3E0002866CD /* keys.c in Sources */,

cyassl/ssl.h

@@ -226,7 +226,7 @@
 #define CyaSSL_CTX_get_ex_new_index wolfSSL_CTX_get_ex_new_index
 
 
-/* io.c */
+/* wolfio.c */
 #define CYASSL_CBIO_ERR_ISR        WOLFSSL_CBIO_ERR_ISR
 #define CYASSL_CBIO_ERR_TIMEOUT    WOLFSSL_CBIO_ERR_TIMEOUT
 #define CYASSL_CBIO_ERR_GENERAL    WOLFSSL_CBIO_ERR_GENERAL

mcapi/wolfssl.X/nbproject/configurations.xml

@@ -69,7 +69,7 @@
       <logicalFolder name="src" displayName="wolfssl" projectFiles="true">
         <itemPath>../../src/crl.c</itemPath>
         <itemPath>../../src/internal.c</itemPath>
-        <itemPath>../../src/io.c</itemPath>
+        <itemPath>../../src/wolfio.c</itemPath>
         <itemPath>../../src/keys.c</itemPath>
         <itemPath>../../src/ocsp.c</itemPath>
         <itemPath>../../src/sniffer.c</itemPath>

mplabx/wolfssl.X/nbproject/configurations.xml

@@ -68,7 +68,7 @@
       <logicalFolder name="f1" displayName="wolfssl" projectFiles="true">
         <itemPath>../../src/crl.c</itemPath>
         <itemPath>../../src/internal.c</itemPath>
-        <itemPath>../../src/io.c</itemPath>
+        <itemPath>../../src/wolfio.c</itemPath>
         <itemPath>../../src/keys.c</itemPath>
         <itemPath>../../src/ocsp.c</itemPath>
         <itemPath>../../src/sniffer.c</itemPath>

rpm/spec.in

@@ -173,7 +173,7 @@ mkdir -p $RPM_BUILD_ROOT/
 %{_includedir}/wolfssl/callbacks.h
 %{_includedir}/wolfssl/certs_test.h
 %{_includedir}/wolfssl/crl.h
-%{_includedir}/wolfssl/io.h
+%{_includedir}/wolfssl/wolfio.h
 %{_includedir}/wolfssl/wolfcrypt/aes.h
 %{_includedir}/wolfssl/wolfcrypt/cmac.h
 %{_includedir}/wolfssl/wolfcrypt/arc4.h
@@ -282,6 +282,8 @@ mkdir -p $RPM_BUILD_ROOT/
 %{_libdir}/pkgconfig/wolfssl.pc
 
 %changelog
+* Fri Sep 08 2017 Jacob Barthelmeh <jacob@wolfssl.com>
+- Change name for header wolfssl/io.h to wolfssl/wolfio.h
 * Fri Aug 04 2017 Jacob Barthelmeh <jacob@wolfssl.com>
 - Added header for wolfssl/wolfcrypt/cpuid.h, wolfssl/wolfcrypt/sha3.h
 * Thu May 04 2017 Jacob Barthelmeh <jacob@wolfssl.com>

src/include.am

@@ -272,7 +272,7 @@ if !BUILD_CRYPTONLY
 # ssl files
 src_libwolfssl_la_SOURCES += \
                src/internal.c \
-               src/io.c \
+               src/wolfio.c \
                src/keys.c \
                src/ssl.c \
                src/tls.c

src/io.c → src/wolfio.c

@@ -1,4 +1,4 @@
-/* io.c
+/* wolfio.c
  *
  * Copyright (C) 2006-2016 wolfSSL Inc.
  *
@@ -36,7 +36,7 @@
 
 #include <wolfssl/internal.h>
 #include <wolfssl/error-ssl.h>
-#include <wolfssl/io.h>
+#include <wolfssl/wolfio.h>
 
 #if defined(HAVE_HTTP_CLIENT)
     #include <stdlib.h>   /* atoi(), strtol() */

tirtos/packages/ti/net/wolfssl/package.bld

@@ -45,7 +45,7 @@ var wolfSSLObjList = [
     "wolfcrypt/src/wc_encrypt.c",
 
     "src/internal.c",
-    "src/io.c",
+    "src/wolfio.c",
     "src/keys.c",
     "src/ssl.c",
     "src/tls.c",

wolfssl-ntru.vcproj

@@ -231,7 +231,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\io.c"
+				RelativePath=".\src\wolfio.c"
 				>
 			</File>
 			<File

wolfssl.vcproj

@@ -228,7 +228,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\io.c"
+				RelativePath=".\src\wolfio.c"
 				>
 			</File>
 			<File

wolfssl.vcxproj

@@ -278,7 +278,7 @@
   <ItemGroup>
     <ClCompile Include="src\crl.c" />
     <ClCompile Include="src\internal.c" />
-    <ClCompile Include="src\io.c" />
+    <ClCompile Include="src\wolfio.c" />
     <ClCompile Include="src\keys.c" />
     <ClCompile Include="src\ocsp.c" />
     <ClCompile Include="src\ssl.c" />

wolfssl/include.am

@@ -18,7 +18,7 @@ nobase_include_HEADERS+= \
                          wolfssl/version.h \
                          wolfssl/ocsp.h \
                          wolfssl/crl.h \
-                         wolfssl/io.h
+                         wolfssl/wolfio.h
 
 noinst_HEADERS+= \
                          wolfssl/internal.h

wolfssl/ssl.h

@@ -92,7 +92,7 @@ typedef struct WOLFSSL_CRL          WOLFSSL_CRL;
 /* redeclare guard */
 #define WOLFSSL_TYPES_DEFINED
 
-#include <wolfssl/io.h>
+#include <wolfssl/wolfio.h>
 
 
 #ifndef WOLFSSL_RSA_TYPE_DEFINED /* guard on redeclaration */

wolfssl/io.h → wolfssl/wolfio.h

@@ -35,7 +35,7 @@
 #endif
 
 #if !defined(WOLFSSL_USER_IO)
-    /* Micrium uses NetSock I/O callbacks in io.c */
+    /* Micrium uses NetSock I/O callbacks in wolfio.c */
     #if !defined(USE_WOLFSSL_IO) && !defined(MICRIUM)
         #define USE_WOLFSSL_IO
     #endif