diff --git a/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp b/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp
index 219a61c9a..6161beeb2 100644
--- a/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp
+++ b/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp
@@ -2056,7 +2056,7 @@
$PROJ_DIR$\..\..\..\..\src\internal.c
- $PROJ_DIR$\..\..\..\..\src\io.c
+ $PROJ_DIR$\..\..\..\..\src\wolfio.c
$PROJ_DIR$\..\..\..\..\src\keys.c
diff --git a/IDE/INTIME-RTOS/libwolfssl.vcxproj b/IDE/INTIME-RTOS/libwolfssl.vcxproj
index 155da63aa..5fc200943 100755
--- a/IDE/INTIME-RTOS/libwolfssl.vcxproj
+++ b/IDE/INTIME-RTOS/libwolfssl.vcxproj
@@ -17,7 +17,7 @@
-
+
diff --git a/IDE/LINUX-SGX/sgx_t_static.mk b/IDE/LINUX-SGX/sgx_t_static.mk
index 195d370b4..c7ee276c9 100644
--- a/IDE/LINUX-SGX/sgx_t_static.mk
+++ b/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\
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt b/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt
index 69f64de42..2cecde47e 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvopt
@@ -1223,8 +1223,8 @@
0
0
0
- ..\..\..\src\io.c
- io.c
+ ..\..\..\src\wolfio.c
+ wolfio.c
0
0
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj b/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj
index 7997abb80..1cac8782a 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-wolfSSL-Lib.uvproj
@@ -657,9 +657,9 @@
..\..\..\src\internal.c
- io.c
+ wolfio.c
1
- ..\..\..\src\io.c
+ ..\..\..\src\wolfio.c
keys.c
@@ -1366,9 +1366,9 @@
..\..\..\src\internal.c
- io.c
+ wolfio.c
1
- ..\..\..\src\io.c
+ ..\..\..\src\wolfio.c
keys.c
@@ -2075,9 +2075,9 @@
..\..\..\src\internal.c
- io.c
+ wolfio.c
1
- ..\..\..\src\io.c
+ ..\..\..\src\wolfio.c
keys.c
diff --git a/IDE/MYSQL/CMakeLists_wolfSSL.txt b/IDE/MYSQL/CMakeLists_wolfSSL.txt
index 4f15e1f3f..0fde07faf 100644
--- a/IDE/MYSQL/CMakeLists_wolfSSL.txt
+++ b/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})
diff --git a/IDE/OPENSTM32/.project b/IDE/OPENSTM32/.project
index 07ff873f8..9d5719b8d 100644
--- a/IDE/OPENSTM32/.project
+++ b/IDE/OPENSTM32/.project
@@ -81,9 +81,9 @@
PARENT-2-PROJECT_LOC/src/internal.c
- Middlewares/Third_Party/wolfSSL/src/io.c
+ Middlewares/Third_Party/wolfSSL/src/wolfio.c
1
- PARENT-2-PROJECT_LOC/src/io.c
+ PARENT-2-PROJECT_LOC/src/wolfio.c
Middlewares/Third_Party/wolfSSL/src/keys.c
@@ -211,9 +211,9 @@
PARENT-2-PROJECT_LOC/wolfssl/internal.h
- Middlewares/Third_Party/wolfSSL/wolfssl/io.h
+ Middlewares/Third_Party/wolfSSL/wolfssl/wolfio.h
1
- PARENT-2-PROJECT_LOC/wolfssl/io.h
+ PARENT-2-PROJECT_LOC/wolfssl/wolfio.h
Middlewares/Third_Party/wolfSSL/wolfssl/ocsp.h
diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp
index 8b228c4c4..432560a2f 100644
--- a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp
+++ b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp
@@ -129,7 +129,7 @@
-
+
diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp
index 30156bf33..f9be95d06 100644
--- a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp
+++ b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp
@@ -307,7 +307,7 @@
-
+
diff --git a/IDE/WIN/wolfssl-fips.vcxproj b/IDE/WIN/wolfssl-fips.vcxproj
index 8061fda00..ebdf4fc28 100644
--- a/IDE/WIN/wolfssl-fips.vcxproj
+++ b/IDE/WIN/wolfssl-fips.vcxproj
@@ -290,7 +290,7 @@
-
+
diff --git a/IDE/iOS/wolfssl-FIPS.xcodeproj/project.pbxproj b/IDE/iOS/wolfssl-FIPS.xcodeproj/project.pbxproj
index 325443d41..561b16dde 100644
--- a/IDE/iOS/wolfssl-FIPS.xcodeproj/project.pbxproj
+++ b/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 = ""; };
521646021A89928E0062516A /* internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = internal.c; path = ../../src/internal.c; sourceTree = ""; };
- 521646031A89928E0062516A /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io.c; path = ../../src/io.c; sourceTree = ""; };
+ 521646031A89928E0062516A /* wolfio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = wolfio.c; path = ../../src/wolfio.c; sourceTree = ""; };
521646041A89928E0062516A /* keys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = keys.c; path = ../../src/keys.c; sourceTree = ""; };
521646051A89928E0062516A /* ocsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ocsp.c; path = ../../src/ocsp.c; sourceTree = ""; };
521646061A89928E0062516A /* sniffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sniffer.c; path = ../../src/sniffer.c; sourceTree = ""; };
@@ -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 */,
diff --git a/cyassl/ssl.h b/cyassl/ssl.h
index de7c1990a..0400e121c 100644
--- a/cyassl/ssl.h
+++ b/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
diff --git a/mcapi/wolfssl.X/nbproject/configurations.xml b/mcapi/wolfssl.X/nbproject/configurations.xml
index 591ed069c..d805bac76 100644
--- a/mcapi/wolfssl.X/nbproject/configurations.xml
+++ b/mcapi/wolfssl.X/nbproject/configurations.xml
@@ -69,7 +69,7 @@
../../src/crl.c
../../src/internal.c
- ../../src/io.c
+ ../../src/wolfio.c
../../src/keys.c
../../src/ocsp.c
../../src/sniffer.c
diff --git a/mplabx/wolfssl.X/nbproject/configurations.xml b/mplabx/wolfssl.X/nbproject/configurations.xml
index a398940ae..a07c30598 100755
--- a/mplabx/wolfssl.X/nbproject/configurations.xml
+++ b/mplabx/wolfssl.X/nbproject/configurations.xml
@@ -68,7 +68,7 @@
../../src/crl.c
../../src/internal.c
- ../../src/io.c
+ ../../src/wolfio.c
../../src/keys.c
../../src/ocsp.c
../../src/sniffer.c
diff --git a/rpm/spec.in b/rpm/spec.in
index 73ded5ab0..b1a02cb84 100644
--- a/rpm/spec.in
+++ b/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
+- Change name for header wolfssl/io.h to wolfssl/wolfio.h
* Fri Aug 04 2017 Jacob Barthelmeh
- Added header for wolfssl/wolfcrypt/cpuid.h, wolfssl/wolfcrypt/sha3.h
* Thu May 04 2017 Jacob Barthelmeh
diff --git a/src/include.am b/src/include.am
index 7620d725d..60db9fd56 100644
--- a/src/include.am
+++ b/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
diff --git a/src/io.c b/src/wolfio.c
similarity index 99%
rename from src/io.c
rename to src/wolfio.c
index 13585e7a8..11c864f91 100644
--- a/src/io.c
+++ b/src/wolfio.c
@@ -1,4 +1,4 @@
-/* io.c
+/* wolfio.c
*
* Copyright (C) 2006-2016 wolfSSL Inc.
*
@@ -36,7 +36,7 @@
#include
#include
-#include
+#include
#if defined(HAVE_HTTP_CLIENT)
#include /* atoi(), strtol() */
diff --git a/tirtos/packages/ti/net/wolfssl/package.bld b/tirtos/packages/ti/net/wolfssl/package.bld
index 8bc657aaa..7f2ef948d 100644
--- a/tirtos/packages/ti/net/wolfssl/package.bld
+++ b/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",
diff --git a/wolfssl-ntru.vcproj b/wolfssl-ntru.vcproj
index 3b7703c1b..18964c739 100755
--- a/wolfssl-ntru.vcproj
+++ b/wolfssl-ntru.vcproj
@@ -231,7 +231,7 @@
>
-
+
diff --git a/wolfssl/include.am b/wolfssl/include.am
index 029bc3d17..201a96fbe 100644
--- a/wolfssl/include.am
+++ b/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
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index 4a31a9495..20e8c9a2e 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -92,7 +92,7 @@ typedef struct WOLFSSL_CRL WOLFSSL_CRL;
/* redeclare guard */
#define WOLFSSL_TYPES_DEFINED
-#include
+#include
#ifndef WOLFSSL_RSA_TYPE_DEFINED /* guard on redeclaration */
diff --git a/wolfssl/io.h b/wolfssl/wolfio.h
similarity index 99%
rename from wolfssl/io.h
rename to wolfssl/wolfio.h
index c9d859b9f..1c4850e44 100644
--- a/wolfssl/io.h
+++ b/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