diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:00:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:00:18 +0000 |
commit | 49222564d195f9d26eb0d02e036d38743f9d7da2 (patch) | |
tree | 50f5aae0b7d98c210d511a512c92fc045a5ffbbf /src/util/crypto_symmetric.c | |
parent | b457e38ca51632f6d51a705859a1a434296729c7 (diff) | |
download | gnunet-49222564d195f9d26eb0d02e036d38743f9d7da2.tar.gz gnunet-49222564d195f9d26eb0d02e036d38743f9d7da2.zip |
-lower log level
Diffstat (limited to 'src/util/crypto_symmetric.c')
-rw-r--r-- | src/util/crypto_symmetric.c | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c index bea9c3233..58ad33170 100644 --- a/src/util/crypto_symmetric.c +++ b/src/util/crypto_symmetric.c | |||
@@ -158,7 +158,8 @@ GNUNET_CRYPTO_symmetric_encrypt (const void *block, | |||
158 | * this size should be the same as @c size. | 158 | * this size should be the same as @c size. |
159 | */ | 159 | */ |
160 | ssize_t | 160 | ssize_t |
161 | GNUNET_CRYPTO_symmetric_decrypt (const void *block, size_t size, | 161 | GNUNET_CRYPTO_symmetric_decrypt (const void *block, |
162 | size_t size, | ||
162 | const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey, | 163 | const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey, |
163 | const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, | 164 | const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, |
164 | void *result) | 165 | void *result) |
@@ -190,8 +191,10 @@ GNUNET_CRYPTO_symmetric_decrypt (const void *block, size_t size, | |||
190 | */ | 191 | */ |
191 | void | 192 | void |
192 | GNUNET_CRYPTO_symmetric_derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, | 193 | GNUNET_CRYPTO_symmetric_derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, |
193 | const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, | 194 | const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, |
194 | const void *salt, size_t salt_len, ...) | 195 | const void *salt, |
196 | size_t salt_len, | ||
197 | ...) | ||
195 | { | 198 | { |
196 | va_list argp; | 199 | va_list argp; |
197 | 200 | ||
@@ -212,8 +215,10 @@ GNUNET_CRYPTO_symmetric_derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationV | |||
212 | */ | 215 | */ |
213 | void | 216 | void |
214 | GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, | 217 | GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, |
215 | const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, | 218 | const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, |
216 | const void *salt, size_t salt_len, va_list argp) | 219 | const void *salt, |
220 | size_t salt_len, | ||
221 | va_list argp) | ||
217 | { | 222 | { |
218 | char aes_salt[salt_len + 4]; | 223 | char aes_salt[salt_len + 4]; |
219 | char twofish_salt[salt_len + 4]; | 224 | char twofish_salt[salt_len + 4]; |
@@ -222,14 +227,20 @@ GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializatio | |||
222 | memcpy (&aes_salt[salt_len], "AES!", 4); | 227 | memcpy (&aes_salt[salt_len], "AES!", 4); |
223 | memcpy (twofish_salt, salt, salt_len); | 228 | memcpy (twofish_salt, salt, salt_len); |
224 | memcpy (&twofish_salt[salt_len], "FISH", 4); | 229 | memcpy (&twofish_salt[salt_len], "FISH", 4); |
225 | GNUNET_CRYPTO_kdf_v (iv->aes_iv, sizeof (iv->aes_iv), | 230 | GNUNET_CRYPTO_kdf_v (iv->aes_iv, |
226 | aes_salt, salt_len + 4, | 231 | sizeof (iv->aes_iv), |
227 | skey->aes_key, sizeof (skey->aes_key), | 232 | aes_salt, |
233 | salt_len + 4, | ||
234 | skey->aes_key, | ||
235 | sizeof (skey->aes_key), | ||
228 | argp); | 236 | argp); |
229 | GNUNET_CRYPTO_kdf_v (iv->twofish_iv, sizeof (iv->twofish_iv), | 237 | GNUNET_CRYPTO_kdf_v (iv->twofish_iv, |
230 | twofish_salt, salt_len + 4, | 238 | sizeof (iv->twofish_iv), |
231 | skey->twofish_key, sizeof (skey->twofish_key), | 239 | twofish_salt, |
240 | salt_len + 4, | ||
241 | skey->twofish_key, | ||
242 | sizeof (skey->twofish_key), | ||
232 | argp); | 243 | argp); |
233 | } | 244 | } |
234 | 245 | ||
235 | /* end of crypto_aes.c */ | 246 | /* end of crypto_symmetric.c */ |