* @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;
(sessionkey, GNUNET_CRYPTO_AES_KEY_LENGTH)))
{
GNUNET_break (0);
- return GNUNET_SYSERR;
+ return -1;
}
GNUNET_assert (0 == gcry_cipher_open (&handle,
GCRY_CIPHER_AES256,
/**
* Decrypt a given block with the sessionkey.
- * @param sessionkey the key used to decrypt
+ *
* @param block the data to decrypt, encoded as returned by encrypt
* @param size the size of the block to decrypt
+ * @param sessionkey the key used to decrypt
* @param iv the initialization vector to use, use INITVALUE
* for streams.
* @param result address to store the result at
* @return -1 on failure, size of decrypted block on success
*/
-int
-GNUNET_CRYPTO_aes_decrypt (const struct GNUNET_CRYPTO_AesSessionKey
- *sessionkey, 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)
+ * iv, void *result)
{
gcry_cipher_hd_t handle;
int rc;
(sessionkey, GNUNET_CRYPTO_AES_KEY_LENGTH)))
{
GNUNET_break (0);
- return GNUNET_SYSERR;
+ return -1;
}
GNUNET_assert (0 == gcry_cipher_open (&handle,
GCRY_CIPHER_AES256,
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 */