aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2015-05-04 17:23:13 +0200
committerAndreas Schneider <asn@cryptomilk.org>2015-05-04 17:54:01 +0200
commit244881b87d7ac113356ede1b3788c9a40b533778 (patch)
tree7e51c39122bfe93af27ae6ced888b5c3dcd72b0c
parentcf05e653de569225775d6bf996ffefba9e8e6135 (diff)
downloadlibssh-244881b87d7ac113356ede1b3788c9a40b533778.tar.gz
libssh-244881b87d7ac113356ede1b3788c9a40b533778.tar.xz
libssh-244881b87d7ac113356ede1b3788c9a40b533778.zip
external: Make sure we burn buffers in bcrypt
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--src/external/bcrypt_pbkdf.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/external/bcrypt_pbkdf.c b/src/external/bcrypt_pbkdf.c
index 27094744..79eee9a4 100644
--- a/src/external/bcrypt_pbkdf.c
+++ b/src/external/bcrypt_pbkdf.c
@@ -96,9 +96,9 @@ bcrypt_hash(uint8_t *sha2pass, uint8_t *sha2salt, uint8_t *out)
}
/* zap */
- memset(ciphertext, 0, sizeof(ciphertext));
- memset(cdata, 0, sizeof(cdata));
- memset(&state, 0, sizeof(state));
+ BURN_BUFFER(ciphertext, sizeof(ciphertext));
+ BURN_BUFFER(cdata, sizeof(cdata));
+ BURN_BUFFER(&state, sizeof(state));
}
int
@@ -173,8 +173,7 @@ bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltl
}
/* zap */
- memset(out, 0, sizeof(out));
- memset(countsalt, 0, saltlen + 4);
+ BURN_BUFFER(out, sizeof(out));
free(countsalt);
return 0;