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

More warnings fixes.

Browse Source
This commit is contained in:
Milan Broz
2018-09-27 20:54:06 +02:00
parent a6e3a31690
commit 5be31bbce6
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libdevmapper.c
View File

@@ -394,7 +394,7 @@ static int cipher_c2dm(const char *org_c, const char *org_i, unsigned tag_size,
char *i_dm, int i_dm_size) char *i_dm, int i_dm_size)
{ {
int c_size = 0, i_size = 0, i; int c_size = 0, i_size = 0, i;
char cipher[CLEN], mode[CLEN], iv[CLEN], tmp[CLEN]; char cipher[CLEN], mode[CLEN], iv[CLEN+1], tmp[CLEN];
char capi[CAPIL]; char capi[CAPIL];
if (!c_dm || !c_dm_size || !i_dm || !i_dm_size) if (!c_dm || !c_dm_size || !i_dm || !i_dm_size)
@@ -407,7 +407,7 @@ static int cipher_c2dm(const char *org_c, const char *org_i, unsigned tag_size,
i = sscanf(tmp, "%" CLENS "[^-]-%" CLENS "s", mode, iv); i = sscanf(tmp, "%" CLENS "[^-]-%" CLENS "s", mode, iv);
if (i == 1) { if (i == 1) {
memset(iv, 0, sizeof(iv)); memset(iv, 0, sizeof(iv));
strncpy(iv, mode, sizeof(iv)); strncpy(iv, mode, sizeof(iv)-1);
*mode = '\0'; *mode = '\0';
if (snprintf(capi, sizeof(capi), "%s", cipher) < 0) if (snprintf(capi, sizeof(capi), "%s", cipher) < 0)
return -EINVAL; return -EINVAL;
@@ -454,7 +454,7 @@ static int cipher_c2dm(const char *org_c, const char *org_i, unsigned tag_size,
static int cipher_dm2c(char **org_c, char **org_i, const char *c_dm, const char *i_dm) static int cipher_dm2c(char **org_c, char **org_i, const char *c_dm, const char *i_dm)
{ {
char cipher[CLEN], mode[CLEN], iv[CLEN], auth[CLEN]; char cipher[CLEN], mode[CLEN], iv[CLEN], auth[CLEN];
char tmp[CAPIL], dmcrypt_tmp[CAPIL*2], capi[CAPIL]; char tmp[CAPIL], dmcrypt_tmp[CAPIL*2], capi[CAPIL+1];
size_t len; size_t len;
int i; int i;
@@ -497,7 +497,7 @@ static int cipher_dm2c(char **org_c, char **org_i, const char *c_dm, const char
} else } else
*org_i = NULL; *org_i = NULL;
memset(capi, 0, sizeof(capi)); memset(capi, 0, sizeof(capi));
strncpy(capi, tmp, sizeof(capi)); strncpy(capi, tmp, sizeof(capi)-1);
} }
i = sscanf(capi, "%" CLENS "[^(](%" CLENS "[^)])", mode, cipher); i = sscanf(capi, "%" CLENS "[^(](%" CLENS "[^)])", mode, cipher);

1
lib/luks2/luks2_luks1_convert.c
View File

@@ -830,6 +830,7 @@ int LUKS2_luks2_to_luks1(struct crypt_device *cd, struct luks2_hdr *hdr2, struct
hdr1->payloadOffset = offset; hdr1->payloadOffset = offset;
strncpy(hdr1->uuid, hdr2->uuid, UUID_STRING_L); /* max 36 chars */ strncpy(hdr1->uuid, hdr2->uuid, UUID_STRING_L); /* max 36 chars */
hdr1->uuid[UUID_STRING_L-1] = '\0';
memcpy(hdr1->magic, luksMagic, LUKS_MAGIC_L); memcpy(hdr1->magic, luksMagic, LUKS_MAGIC_L);

2
src/cryptsetup.c
View File

@@ -175,7 +175,7 @@ static int action_open_plain(void)
.sector_size = opt_sector_size, .sector_size = opt_sector_size,
}; };
char *password = NULL; char *password = NULL;
size_t passwordLen, key_size_max, signatures, size_t passwordLen, key_size_max, signatures = 0,
key_size = (opt_key_size ?: DEFAULT_PLAIN_KEYBITS) / 8; key_size = (opt_key_size ?: DEFAULT_PLAIN_KEYBITS) / 8;
uint32_t activate_flags = 0; uint32_t activate_flags = 0;
int r; int r;