oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

roken: Do not use net_read() for regular files!

Browse Source 
The bug fixed herein almost certainly means that PKINIT was never
working on Windows, since lib/hx509 uses rk_undumpdata() to read regular
files containing certificates and keys, but then since rk_undumpdata()
was using net_read(), that can't have worked.  On Windows net_read()
insists on the FD being a socket, and because of winsock, the namespaces
of socket and file descriptors on Windows are distinct.
This commit is contained in:
Nicolas Williams
2022-12-20 22:19:39 -06:00
parent 8f71755d2b
commit ca2467a4c4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/roken/dumpdata.c
View File

@@ -71,6 +71,9 @@ rk_undumpdata(const char *filename, void **buf, size_t *size)
ret = errno; ret = errno;
goto out; goto out;
} }
if (sb.st_size < 0)
sb.st_size = 0;
*buf = malloc(sb.st_size); *buf = malloc(sb.st_size);
if (*buf == NULL) { if (*buf == NULL) {
ret = ENOMEM; ret = ENOMEM;
@@ -78,7 +81,7 @@ rk_undumpdata(const char *filename, void **buf, size_t *size)
} }
*size = sb.st_size; *size = sb.st_size;
sret = net_read(fd, *buf, *size); sret = read(fd, *buf, *size);
if (sret < 0) if (sret < 0)
ret = errno; ret = errno;
else if (sret != (ssize_t)*size) else if (sret != (ssize_t)*size)