Returns now GNUNET_SYSERR

[oweals/gnunet.git] / src / util / crypto_aes.c

diff --git a/src/util/crypto_aes.c b/src/util/crypto_aes.c
index 6db932b5bd71353716c8aabce0f0578f245cc8ea..1ab4a7301a87526a655476e22cdb0f50c06af5e9 100644 (file)
--- a/src/util/crypto_aes.c
+++ b/src/util/crypto_aes.c
@@ -76,9 +76,9 @@ ssize_t
 GNUNET_CRYPTO_aes_encrypt (const void *block,
                            size_t len,
                            const struct GNUNET_CRYPTO_AesSessionKey
-                           *sessionkey,
+                           * sessionkey,
                            const struct GNUNET_CRYPTO_AesInitializationVector
-                           *iv, void *result)
+                           * iv, void *result)
 {
   gcry_cipher_hd_t handle;
   int rc;
@@ -116,12 +116,12 @@ GNUNET_CRYPTO_aes_encrypt (const void *block,
  * @return -1 on failure, size of decrypted block on success
  */
 ssize_t
-GNUNET_CRYPTO_aes_decrypt (const void *block, 
-                          size_t size,
+GNUNET_CRYPTO_aes_decrypt (const void *block,
+                           size_t size,
                            const struct GNUNET_CRYPTO_AesSessionKey
-                           *sessionkey, 
-                          const struct GNUNET_CRYPTO_AesInitializationVector
-                           *iv, void *result)
+                           * sessionkey,
+                           const struct GNUNET_CRYPTO_AesInitializationVector
+                           * iv, void *result)
 {
   gcry_cipher_hd_t handle;
   int rc;
@@ -148,4 +148,43 @@ GNUNET_CRYPTO_aes_decrypt (const void *block,
   return size;
 }
 
+/**
+ * @brief Derive an IV
+ * @param iv initialization vector
+ * @param skey session key
+ * @param salt salt for the derivation
+ * @param salt_len size of the salt
+ * @param ... pairs of void * & size_t for context chunks, terminated by NULL
+ */
+void
+GNUNET_CRYPTO_aes_derive_iv (struct GNUNET_CRYPTO_AesInitializationVector *iv,
+    const struct GNUNET_CRYPTO_AesSessionKey *skey,
+    const void *salt, size_t salt_len,
+    ...)
+{
+  va_list argp;
+
+  va_start (argp, salt_len);
+  GNUNET_CRYPTO_aes_derive_iv_v (iv, skey, salt, salt_len, argp);
+  va_end (argp);
+}
+
+/**
+ * @brief Derive an IV
+ * @param iv initialization vector
+ * @param skey session key
+ * @param salt salt for the derivation
+ * @param salt_len size of the salt
+ * @param argp pairs of void * & size_t for context chunks, terminated by NULL
+ */
+void
+GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv,
+    const struct GNUNET_CRYPTO_AesSessionKey *skey,
+    const void *salt, size_t salt_len,
+    va_list argp)
+{
+  GNUNET_CRYPTO_kdf_v (iv->iv, sizeof(iv->iv), salt, salt_len, skey->key,
+      sizeof(skey->key), argp);
+}
+
 /* end of crypto_aes.c */