diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2019-07-26 22:26:13 +0900 |
---|---|---|
committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2019-07-26 22:26:13 +0900 |
commit | 0e3d93fc1d008d7561e97ceccc35f092e5fc0f36 (patch) | |
tree | 9bbd0a3e9393d86c3490bf2efe3f39fa335a08b4 /patches/tls_util.c.patch | |
parent | 30e91bc6d2b6249da1c8c40582c63601a4838efc (diff) | |
download | portable-0e3d93fc1d008d7561e97ceccc35f092e5fc0f36.tar.gz portable-0e3d93fc1d008d7561e97ceccc35f092e5fc0f36.tar.bz2 portable-0e3d93fc1d008d7561e97ceccc35f092e5fc0f36.zip |
Force binary mode for open() on WIN32
Reported by @ulfworsoe https://github.com/libressl-portable/portable/issues/542
Diffstat (limited to 'patches/tls_util.c.patch')
-rw-r--r-- | patches/tls_util.c.patch | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/patches/tls_util.c.patch b/patches/tls_util.c.patch index 10f2f99..9f57d83 100644 --- a/patches/tls_util.c.patch +++ b/patches/tls_util.c.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | --- tls/tls_util.c.orig Sun Mar 18 00:30:07 2018 | 1 | --- tls/tls_util.c.orig Fri Jul 26 22:17:04 2019 |
2 | +++ tls/tls_util.c Sun Mar 18 00:31:09 2018 | 2 | +++ tls/tls_util.c Fri Jul 26 22:21:22 2019 |
3 | @@ -17,6 +17,10 @@ | 3 | @@ -17,6 +17,10 @@ |
4 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 4 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
5 | */ | 5 | */ |
@@ -11,3 +11,15 @@ | |||
11 | #include <sys/stat.h> | 11 | #include <sys/stat.h> |
12 | 12 | ||
13 | #include <stdlib.h> | 13 | #include <stdlib.h> |
14 | @@ -161,7 +165,11 @@ tls_load_file(const char *name, size_t *len, char *pas | ||
15 | |||
16 | *len = 0; | ||
17 | |||
18 | +#ifndef _WIN32 | ||
19 | if ((fd = open(name, O_RDONLY)) == -1) | ||
20 | +#else | ||
21 | + if ((fd = open(name, O_RDONLY | O_BINARY)) == -1) | ||
22 | +#endif | ||
23 | return (NULL); | ||
24 | |||
25 | /* Just load the file into memory without decryption */ | ||