diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:20:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:20:23 +0000 |
commit | d8c53b12a818ff7cf82d06a1a69c395bdef85ee6 (patch) | |
tree | 0ebb0db416c157fcfde51a941185819dd12d51fd /src/util/crypto_symmetric.c | |
parent | 5184c17d32a39c928c2a0fec3ee1ad098bbaa562 (diff) | |
download | gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.tar.gz gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.zip |
-avoid calling memcpy() with NULL argument, even if len is 0
Diffstat (limited to 'src/util/crypto_symmetric.c')
-rw-r--r-- | src/util/crypto_symmetric.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c index 58ad33170..381a5d2f8 100644 --- a/src/util/crypto_symmetric.c +++ b/src/util/crypto_symmetric.c | |||
@@ -223,10 +223,10 @@ GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializatio | |||
223 | char aes_salt[salt_len + 4]; | 223 | char aes_salt[salt_len + 4]; |
224 | char twofish_salt[salt_len + 4]; | 224 | char twofish_salt[salt_len + 4]; |
225 | 225 | ||
226 | memcpy (aes_salt, salt, salt_len); | 226 | GNUNET_memcpy (aes_salt, salt, salt_len); |
227 | memcpy (&aes_salt[salt_len], "AES!", 4); | 227 | GNUNET_memcpy (&aes_salt[salt_len], "AES!", 4); |
228 | memcpy (twofish_salt, salt, salt_len); | 228 | GNUNET_memcpy (twofish_salt, salt, salt_len); |
229 | memcpy (&twofish_salt[salt_len], "FISH", 4); | 229 | GNUNET_memcpy (&twofish_salt[salt_len], "FISH", 4); |
230 | GNUNET_CRYPTO_kdf_v (iv->aes_iv, | 230 | GNUNET_CRYPTO_kdf_v (iv->aes_iv, |
231 | sizeof (iv->aes_iv), | 231 | sizeof (iv->aes_iv), |
232 | aes_salt, | 232 | aes_salt, |