X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fcrypto_aes.c;h=200c367c1aeb7dc60c0523aaebff26a563121ee8;hb=502af2167f7c218366666ca4944bd7cc54b5b19a;hp=8fa935d9f7ce90a22fc5e95716e9d221b9546ba8;hpb=ba388145e2a982d25fb27af1ea80231625f56ded;p=oweals%2Fgnunet.git

diff --git a/src/util/crypto_aes.c b/src/util/crypto_aes.c
index 8fa935d9f..200c367c1 100644
--- a/src/util/crypto_aes.c
+++ b/src/util/crypto_aes.c
@@ -39,7 +39,7 @@ GNUNET_CRYPTO_aes_create_session_key (struct GNUNET_CRYPTO_AesSessionKey *key)
   gcry_randomize (&key->key[0], GNUNET_CRYPTO_AES_KEY_LENGTH,
                   GCRY_STRONG_RANDOM);
   key->crc32 =
-    htonl (GNUNET_CRYPTO_crc32_n (key, GNUNET_CRYPTO_AES_KEY_LENGTH));
+      htonl (GNUNET_CRYPTO_crc32_n (key, GNUNET_CRYPTO_AES_KEY_LENGTH));
 }
 
 /**
@@ -56,7 +56,7 @@ GNUNET_CRYPTO_aes_check_session_key (const struct GNUNET_CRYPTO_AesSessionKey
   crc = GNUNET_CRYPTO_crc32_n (key, GNUNET_CRYPTO_AES_KEY_LENGTH);
   if (ntohl (key->crc32) == crc)
     return GNUNET_OK;
-  GNUNET_break (0);
+  GNUNET_break_op (0);
   return GNUNET_SYSERR;
 }
 
@@ -72,32 +72,31 @@ GNUNET_CRYPTO_aes_check_session_key (const struct GNUNET_CRYPTO_AesSessionKey
  * @param result the output parameter in which to store the encrypted result
  * @returns the size of the encrypted block, -1 for errors
  */
-int
+ssize_t
 GNUNET_CRYPTO_aes_encrypt (const void *block,
-                           uint16_t len,
+                           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;
 
   if (sessionkey->crc32 !=
-      htonl (GNUNET_CRYPTO_crc32_n
-             (sessionkey, GNUNET_CRYPTO_AES_KEY_LENGTH)))
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
+      htonl (GNUNET_CRYPTO_crc32_n (sessionkey, GNUNET_CRYPTO_AES_KEY_LENGTH)))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
   GNUNET_assert (0 == gcry_cipher_open (&handle,
                                         GCRY_CIPHER_AES256,
                                         GCRY_CIPHER_MODE_CFB, 0));
   rc = gcry_cipher_setkey (handle, sessionkey, GNUNET_CRYPTO_AES_KEY_LENGTH);
   GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
-  rc =
-    gcry_cipher_setiv (handle, iv,
-                       sizeof (struct GNUNET_CRYPTO_AesInitializationVector));
+  rc = gcry_cipher_setiv (handle, iv,
+                          sizeof (struct
+                                  GNUNET_CRYPTO_AesInitializationVector));
   GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
   GNUNET_assert (0 == gcry_cipher_encrypt (handle, result, len, block, len));
   gcry_cipher_close (handle);
@@ -115,36 +114,72 @@ GNUNET_CRYPTO_aes_encrypt (const void *block,
  * @param result address to store the result at
  * @return -1 on failure, size of decrypted block on success
  */
-int
-GNUNET_CRYPTO_aes_decrypt (const void *block, uint16_t size,
+ssize_t
+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;
 
   if (sessionkey->crc32 !=
-      htonl (GNUNET_CRYPTO_crc32_n
-             (sessionkey, GNUNET_CRYPTO_AES_KEY_LENGTH)))
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
+      htonl (GNUNET_CRYPTO_crc32_n (sessionkey, GNUNET_CRYPTO_AES_KEY_LENGTH)))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
   GNUNET_assert (0 == gcry_cipher_open (&handle,
                                         GCRY_CIPHER_AES256,
                                         GCRY_CIPHER_MODE_CFB, 0));
   rc = gcry_cipher_setkey (handle, sessionkey, GNUNET_CRYPTO_AES_KEY_LENGTH);
   GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
-  rc =
-    gcry_cipher_setiv (handle, iv,
-                       sizeof (struct GNUNET_CRYPTO_AesInitializationVector));
+  rc = gcry_cipher_setiv (handle, iv,
+                          sizeof (struct
+                                  GNUNET_CRYPTO_AesInitializationVector));
   GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
-  GNUNET_assert (0 ==
-                 gcry_cipher_decrypt (handle, result, size, block, size));
+  GNUNET_assert (0 == gcry_cipher_decrypt (handle, result, size, block, size));
   gcry_cipher_close (handle);
   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 */