factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix using right functions for file descriptor with MS Visual Studio

Browse Source
This commit is contained in:
kinichiro 2018-03-18 00:38:14 +09:00
parent 639a6629ae
commit 1fb8c9c6be
8 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/keypairtest.c.patch Normal file
View File

@ -0,0 +1,13 @@
--- tests/keypairtest.c.orig Sun Mar 18 00:31:20 2018
+++ tests/keypairtest.c Sun Mar 18 00:31:33 2018
@@ -15,6 +15,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef _MSC_VER
+#define NO_REDEF_POSIX_FUNCTIONS
+#endif
+
#include <sys/stat.h>
#include <err.h>

13
patches/tls_config.c.patch Normal file
View File

@ -0,0 +1,13 @@
--- tls/tls_config.c.orig Sun Mar 18 00:29:59 2018
+++ tls/tls_config.c Sun Mar 18 00:30:51 2018
@@ -15,6 +15,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef _MSC_VER
+#define NO_REDEF_POSIX_FUNCTIONS
+#endif
+
#include <sys/stat.h>
#include <ctype.h>

13
patches/tls_util.c.patch Normal file
View File

@ -0,0 +1,13 @@
--- tls/tls_util.c.orig Sun Mar 18 00:30:07 2018
+++ tls/tls_util.c Sun Mar 18 00:31:09 2018
@@ -17,6 +17,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef _MSC_VER
+#define NO_REDEF_POSIX_FUNCTIONS
+#endif
+
#include <sys/stat.h>
#include <stdlib.h>

2
tests/CMakeLists.txt
View File

@ -215,14 +215,12 @@ target_link_libraries(igetest ${TESTS_LIBS})
add_test(igetest igetest) add_test(igetest igetest)
# keypairtest # keypairtest
if(NOT MSVC)
add_executable(keypairtest keypairtest.c) add_executable(keypairtest keypairtest.c)
target_link_libraries(keypairtest ${TESTS_LIBS}) target_link_libraries(keypairtest ${TESTS_LIBS})
add_test(keypairtest keypairtest add_test(keypairtest keypairtest
${CMAKE_CURRENT_SOURCE_DIR}/ca.pem ${CMAKE_CURRENT_SOURCE_DIR}/ca.pem
${CMAKE_CURRENT_SOURCE_DIR}/server.pem ${CMAKE_CURRENT_SOURCE_DIR}/server.pem
${CMAKE_CURRENT_SOURCE_DIR}/server.pem) ${CMAKE_CURRENT_SOURCE_DIR}/server.pem)
endif()
# md4test # md4test
add_executable(md4test md4test.c) add_executable(md4test md4test.c)

4
tls/compat/ftruncate.c
View File

@ -4,6 +4,8 @@
* Kinichiro Inoguchi <inoguchi@openbsd.org> * Kinichiro Inoguchi <inoguchi@openbsd.org>
*/ */
#ifdef _WIN32
#include <unistd.h> #include <unistd.h>
int int
@ -11,3 +13,5 @@ ftruncate(int fd, off_t length)
{ {
return _chsize(fd, length); return _chsize(fd, length);
} }
#endif

4
tls/compat/getuid.c
View File

@ -4,6 +4,8 @@
* Kinichiro Inoguchi <inoguchi@openbsd.org> * Kinichiro Inoguchi <inoguchi@openbsd.org>
*/ */
#ifdef _WIN32
#include <unistd.h> #include <unistd.h>
uid_t uid_t
@ -12,3 +14,5 @@ getuid(void)
/* Windows fstat sets 0 as st_uid */ /* Windows fstat sets 0 as st_uid */
return 0; return 0;
} }
#endif

6
tls/compat/pread.c
View File

@ -4,6 +4,10 @@
* Kinichiro Inoguchi <inoguchi@openbsd.org> * Kinichiro Inoguchi <inoguchi@openbsd.org>
*/ */
#ifdef _WIN32
#define NO_REDEF_POSIX_FUNCTIONS
#include <unistd.h> #include <unistd.h>
ssize_t ssize_t
@ -21,3 +25,5 @@ pread(int d, void *buf, size_t nbytes, off_t offset)
return -1; return -1;
return bytes; return bytes;
} }
#endif

6
tls/compat/pwrite.c
View File

@ -4,6 +4,10 @@
* Kinichiro Inoguchi <inoguchi@openbsd.org> * Kinichiro Inoguchi <inoguchi@openbsd.org>
*/ */
#ifdef _WIN32
#define NO_REDEF_POSIX_FUNCTIONS
#include <unistd.h> #include <unistd.h>
ssize_t ssize_t
@ -21,3 +25,5 @@ pwrite(int d, const void *buf, size_t nbytes, off_t offset)
return -1; return -1;
return bytes; return bytes;
} }
#endif