scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 20:00:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

replaces old bzero() with memset().

Browse Source
This commit is contained in:
TLINDEN
2013-10-29 23:08:43 +01:00
parent 40a49cd76f
commit 58a3bca8d7
10 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libpcp/config.h.in
View File

@@ -9,9 +9,6 @@
/* Define to 1 if you have the `be32toh' function. */
#undef HAVE_BE32TOH
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H

8
libpcp/key.c
View File

@@ -52,7 +52,7 @@ pcp_key_t *pcpkey_encrypt(pcp_key_t *key, char *passphrase) {
es = pcp_sodium_mac(&encrypted, key->secret, 32, key->nonce, encryptkey);
bzero(encryptkey, 32);
memset(encryptkey, 0, 32);
free(encryptkey);
if(es == 48) {
@@ -77,7 +77,7 @@ pcp_key_t *pcpkey_decrypt(pcp_key_t *key, char *passphrase) {
es = pcp_sodium_verify_mac(&decrypted, key->encrypted, 48, key->nonce, encryptkey);
bzero(encryptkey, 32);
memset(encryptkey, 0, 32);
free(encryptkey);
if(es == 0) {
@@ -140,7 +140,7 @@ void pcp_cleanhashes() {
pcp_key_t *current_key, *tmp;
HASH_ITER(hh, pcpkey_hash, current_key, tmp) {
HASH_DEL(pcpkey_hash,current_key);
bzero(current_key, sizeof(pcp_key_t));
memset(current_key, 0, sizeof(pcp_key_t));
free(current_key); // FIXME: coredumps here after n-th secret keys has been added
}
}
@@ -149,7 +149,7 @@ void pcp_cleanhashes() {
pcp_pubkey_t *current_pub, *ptmp;
HASH_ITER(hh, pcppubkey_hash, current_pub, ptmp) {
HASH_DEL(pcppubkey_hash,current_pub);
bzero(current_pub, sizeof(pcp_pubkey_t));
memset(current_pub, 0, sizeof(pcp_pubkey_t));
free(current_pub);
}
}

4
libpcp/mac.c
View File

@@ -34,8 +34,8 @@ unsigned char *pcp_derivekey(char *passphrase) {
memcpy(key, xor, crypto_secretbox_KEYBYTES);
bzero(passphrase, plen);
bzero(temp, crypto_hash_BYTES);
memset(passphrase, 0, plen);
memset(temp, 0, crypto_hash_BYTES);
free(passphrase);
free(temp);
free(xor);

2
libpcp/mem.c
View File

@@ -11,7 +11,7 @@ void *ucmalloc(size_t s) {
exit(-1);
}
bzero (value, size);
memset (value, 0, size);
//printf("allocated %d bytes at %p\n", (int)size, value);

4
libpcp/vault.c
View File

@@ -124,7 +124,7 @@ int pcpvault_additem(vault_t *vault, void *item, size_t itemsize, uint8_t type,
fwrite(header, sizeof(vault_item_header_t), 1, vault->fd);
fwrite(saveitem, itemsize, 1, vault->fd);
bzero(saveitem, itemsize);
memset(saveitem, 0, itemsize);
free(saveitem);
if(do_hash == 1) {
@@ -223,7 +223,7 @@ unsigned char *pcpvault_create_checksum(vault_t *vault) {
crypto_hash_sha256(checksum, data, datasize);
bzero(data, datasize);
memset(data, 0, datasize);
free(data);
return checksum;

2
libpcp/z85.c
View File

@@ -11,7 +11,7 @@ unsigned char *pcp_padfour(unsigned char *src, size_t srclen, size_t *dstlen) {
dst = (unsigned char*)ucmalloc(outlen);
dst[0] = zerolen; // add the number of zeros we add
memcpy(&dst[1], src, srclen); // add the original
bzero(&dst[srclen+1], zerolen); // pad with zeroes
memset(&dst[srclen+1], 0, zerolen); // pad with zeroes
*dstlen = outlen;