denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

integrity-checker: Use chunk_map() instead of non-portable mmap()

Browse Source
This commit is contained in:
Martin Willi
2014-01-23 15:55:32 +01:00
parent b9ee059ca9
commit 69be6a9e05
1 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/integrity_checker.c
+6 -31
View File
@@ -22,7 +22,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@@ -61,40 +60,17 @@ METHOD(integrity_checker_t, build_file, u_int32_t,
private_integrity_checker_t *this, char *file, size_t *len) private_integrity_checker_t *this, char *file, size_t *len)
{ {
u_int32_t checksum; u_int32_t checksum;
chunk_t contents; chunk_t *contents;
struct stat sb;
void *addr;
int fd;
fd = open(file, O_RDONLY); contents = chunk_map(file, FALSE);
if (fd == -1) if (!contents)
{ {
DBG1(DBG_LIB, " opening '%s' failed: %s", file, strerror(errno)); DBG1(DBG_LIB, " opening '%s' failed: %s", file, strerror(errno));
return 0; return 0;
} }
*len = contents->len;
if (fstat(fd, &sb) == -1) checksum = chunk_hash_static(*contents);
{ chunk_unmap(contents);
DBG1(DBG_LIB, " getting file size of '%s' failed: %s", file,
strerror(errno));
close(fd);
return 0;
}
addr = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (addr == MAP_FAILED)
{
DBG1(DBG_LIB, " mapping '%s' failed: %s", file, strerror(errno));
close(fd);
return 0;
}
*len = sb.st_size;
contents = chunk_create(addr, sb.st_size);
checksum = chunk_hash_static(contents);
munmap(addr, sb.st_size);
close(fd);
return checksum; return checksum;
} }
@@ -318,4 +294,3 @@ integrity_checker_t *integrity_checker_create(char *checksum_library)
} }
return &this->public; return &this->public;
} }