eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-12 19:30:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some clang++ warnings.

Browse Source
This commit is contained in:
Milan Broz
2022-09-30 09:13:19 +02:00
parent e1a84607cc
commit a3f248df9b
7 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/fuzz/crypt2_load_fuzz.cc
View File

@@ -38,7 +38,9 @@ extern "C" {
#include <libcryptsetup.h>
#include <src/cryptsetup.h>
int calculate_checksum(const uint8_t* data, size_t size) {
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
static int calculate_checksum(const uint8_t* data, size_t size) {
struct crypt_hash *hd = NULL;
struct luks2_hdr_disk *hdr = NULL;
int hash_size;
@@ -48,7 +50,7 @@ int calculate_checksum(const uint8_t* data, size_t size) {
// primary header
if (sizeof(struct luks2_hdr_disk) > size)
return 0;
hdr = (struct luks2_hdr_disk *) data;
hdr = CONST_CAST(struct luks2_hdr_disk *) data;
hdr_size1 = be64_to_cpu(hdr->hdr_size);
if (hdr_size1 > size)
@@ -56,7 +58,7 @@ int calculate_checksum(const uint8_t* data, size_t size) {
memset(&hdr->csum, 0, LUKS2_CHECKSUM_L);
if ((r = crypt_hash_init(&hd, "sha256")))
goto out;
if ((r = crypt_hash_write(hd, (char*) data, hdr_size1)))
if ((r = crypt_hash_write(hd, CONST_CAST(char*) data, hdr_size1)))
goto out;
hash_size = crypt_hash_size("sha256");
if (hash_size <= 0) {
@@ -73,7 +75,7 @@ int calculate_checksum(const uint8_t* data, size_t size) {
if (hdr_size1 + sizeof(struct luks2_hdr_disk) > size)
return 0;
hdr = (struct luks2_hdr_disk *) (data + hdr_size1);
hdr = CONST_CAST(struct luks2_hdr_disk *) (data + hdr_size1);
hdr_size2 = be64_to_cpu(hdr->hdr_size);
if (hdr_size1 + hdr_size2 > size)
@@ -97,7 +99,6 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
int fd;
struct crypt_device *cd;
int result;
uint8_t *map;
int r = 0;
char name[] = "/tmp/test-script-fuzz.XXXXXX";