aboutsummaryrefslogtreecommitdiff
path: root/lib/hcrypto/pkcs5.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/hcrypto/pkcs5.c')
-rw-r--r--lib/hcrypto/pkcs5.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/hcrypto/pkcs5.c b/lib/hcrypto/pkcs5.c
index dff3ccea3986..88e71c4dd539 100644
--- a/lib/hcrypto/pkcs5.c
+++ b/lib/hcrypto/pkcs5.c
@@ -85,7 +85,8 @@ PKCS5_PBKDF2_HMAC(const void * password, size_t password_len,
data = &tmpcksum[checksumsize];
- memcpy(data, salt, salt_len);
+ if (salt_len)
+ memcpy(data, salt, salt_len);
keypart = 1;
leftofkey = keylen;