fix more leaks

[oweals/gnunet.git] / src / fs / fs_publish_ublock.c

diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c
index 252268e24ec23dc8a43724f2559a39ef8d85da91..18f4804d17f0f82053c959fd710001063e3f5313 100644 (file)
--- a/src/fs/fs_publish_ublock.c
+++ b/src/fs/fs_publish_ublock.c
@@ -21,7 +21,7 @@
 /**
  * @file fs/fs_publish_ublock.c
  * @brief publish a UBLOCK in GNUnet
- * @see https://gnunet.org/encoding and #2564 
+ * @see https://gnunet.org/encoding and #2564
  * @author Krista Bennett
  * @author Christian Grothoff
  */
@@ -41,10 +41,10 @@
  * @param iv where to store the IV
  * @param label label to use for key derivation
  * @param pub public key to use for key derivation
- */ 
+ */
 static void
-derive_ublock_encryption_key (struct GNUNET_CRYPTO_AesSessionKey *skey,
-                             struct GNUNET_CRYPTO_AesInitializationVector *iv,
+derive_ublock_encryption_key (struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
+                             struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
                              const char *label,
                              const struct GNUNET_CRYPTO_EccPublicSignKey *pub)
 {
@@ -65,11 +65,11 @@ derive_ublock_encryption_key (struct GNUNET_CRYPTO_AesSessionKey *skey,
  * Decrypt the given UBlock, storing the result in output.
  *
  * @param input input data
- * @param input_len number of bytes in input
+ * @param input_len number of bytes in @a input
  * @param ns public key under which the UBlock was stored
  * @param label label under which the UBlock was stored
  * @param output where to write the result, has input_len bytes
- */ 
+ */
 void
 GNUNET_FS_ublock_decrypt_ (const void *input,
                           size_t input_len,
@@ -77,12 +77,12 @@ GNUNET_FS_ublock_decrypt_ (const void *input,
                           const char *label,
                           void *output)
 {
-  struct GNUNET_CRYPTO_AesInitializationVector iv;
-  struct GNUNET_CRYPTO_AesSessionKey skey;
+  struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
+  struct GNUNET_CRYPTO_SymmetricSessionKey skey;
 
   derive_ublock_encryption_key (&skey, &iv,
                                label, ns);
-  GNUNET_CRYPTO_aes_decrypt (input, input_len,
+  GNUNET_CRYPTO_symmetric_decrypt (input, input_len,
                             &skey, &iv,
                              output);
 }
@@ -124,7 +124,7 @@ struct GNUNET_FS_PublishUblockContext
  * @param msg NULL on success, otherwise an error message
  */
 static void
-ublock_put_cont (void *cls, 
+ublock_put_cont (void *cls,
                 int32_t success,
                 struct GNUNET_TIME_Absolute min_expiration,
                 const char *msg)
@@ -167,8 +167,8 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h,
 {
   struct GNUNET_FS_PublishUblockContext *uc;
   struct GNUNET_HashCode query;
-  struct GNUNET_CRYPTO_AesInitializationVector iv;
-  struct GNUNET_CRYPTO_AesSessionKey skey;
+  struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
+  struct GNUNET_CRYPTO_SymmetricSessionKey skey;
   struct GNUNET_CRYPTO_EccPrivateKey *nsd;
   struct GNUNET_CRYPTO_EccPublicSignKey pub;
   char *uris;
@@ -221,7 +221,7 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h,
   }
   size = sizeof (struct UBlock) + slen + mdsize + ulen;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Publishing under identifier `%s'\n",
               label);
   /* get public key of the namespace */
@@ -232,11 +232,11 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h,
 
   /* encrypt ublock */
   ub_enc = GNUNET_malloc (size);
-  GNUNET_CRYPTO_aes_encrypt (&ub_plain[1], 
+  GNUNET_CRYPTO_symmetric_encrypt (&ub_plain[1],
                             ulen + slen + mdsize,
                             &skey, &iv,
                              &ub_enc[1]);
-  ub_enc->purpose.size = htonl (ulen + slen + mdsize + 
+  ub_enc->purpose.size = htonl (ulen + slen + mdsize +
                                sizeof (struct UBlock)
                                - sizeof (struct GNUNET_CRYPTO_EccSignature));
   ub_enc->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_UBLOCK);