1 files changed, 93 insertions, 93 deletions

diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c
index 18784d127..7fad2a884 100644
--- a/src/util/crypto_symmetric.c
+++ b/src/util/crypto_symmetric.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file util/crypto_symmetric.c
@@ -29,7 +29,7 @@
 #include "gnunet_crypto_lib.h"
 #include <gcrypt.h>
 
-#define LOG(kind,...) GNUNET_log_from (kind, "util-crypto-symmetric", __VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log_from(kind, "util-crypto-symmetric", __VA_ARGS__)
 
 /**
  * Create a new SessionKey (for symmetric encryption).
@@ -37,14 +37,14 @@
  * @param key session key to initialize
  */
 void
-GNUNET_CRYPTO_symmetric_create_session_key (struct GNUNET_CRYPTO_SymmetricSessionKey *key)
+GNUNET_CRYPTO_symmetric_create_session_key(struct GNUNET_CRYPTO_SymmetricSessionKey *key)
 {
-  gcry_randomize (key->aes_key,
-                  GNUNET_CRYPTO_AES_KEY_LENGTH,
-                  GCRY_STRONG_RANDOM);
-  gcry_randomize (key->twofish_key,
-                  GNUNET_CRYPTO_AES_KEY_LENGTH,
-                  GCRY_STRONG_RANDOM);
+  gcry_randomize(key->aes_key,
+                 GNUNET_CRYPTO_AES_KEY_LENGTH,
+                 GCRY_STRONG_RANDOM);
+  gcry_randomize(key->twofish_key,
+                 GNUNET_CRYPTO_AES_KEY_LENGTH,
+                 GCRY_STRONG_RANDOM);
 }
 
 
@@ -57,23 +57,23 @@ GNUNET_CRYPTO_symmetric_create_session_key (struct GNUNET_CRYPTO_SymmetricSessio
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 static int
-setup_cipher_aes (gcry_cipher_hd_t *handle,
-                  const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
-                  const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv)
+setup_cipher_aes(gcry_cipher_hd_t *handle,
+                 const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
+                 const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv)
 {
   int rc;
 
-  GNUNET_assert (0 ==
-                 gcry_cipher_open (handle, GCRY_CIPHER_AES256,
-                                   GCRY_CIPHER_MODE_CFB, 0));
-  rc = gcry_cipher_setkey (*handle,
-                           sessionkey->aes_key,
-                           sizeof (sessionkey->aes_key));
-  GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
-  rc = gcry_cipher_setiv (*handle,
-                          iv->aes_iv,
-                          sizeof (iv->aes_iv));
-  GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
+  GNUNET_assert(0 ==
+                gcry_cipher_open(handle, GCRY_CIPHER_AES256,
+                                 GCRY_CIPHER_MODE_CFB, 0));
+  rc = gcry_cipher_setkey(*handle,
+                          sessionkey->aes_key,
+                          sizeof(sessionkey->aes_key));
+  GNUNET_assert((0 == rc) || ((char)rc == GPG_ERR_WEAK_KEY));
+  rc = gcry_cipher_setiv(*handle,
+                         iv->aes_iv,
+                         sizeof(iv->aes_iv));
+  GNUNET_assert((0 == rc) || ((char)rc == GPG_ERR_WEAK_KEY));
   return GNUNET_OK;
 }
 
@@ -87,23 +87,23 @@ setup_cipher_aes (gcry_cipher_hd_t *handle,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 static int
-setup_cipher_twofish (gcry_cipher_hd_t *handle,
-                      const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
-                      const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv)
+setup_cipher_twofish(gcry_cipher_hd_t *handle,
+                     const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
+                     const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv)
 {
   int rc;
 
-  GNUNET_assert (0 ==
-                 gcry_cipher_open (handle, GCRY_CIPHER_TWOFISH,
-                                   GCRY_CIPHER_MODE_CFB, 0));
-  rc = gcry_cipher_setkey (*handle,
-                           sessionkey->twofish_key,
-                           sizeof (sessionkey->twofish_key));
-  GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
-  rc = gcry_cipher_setiv (*handle,
-                          iv->twofish_iv,
-                          sizeof (iv->twofish_iv));
-  GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
+  GNUNET_assert(0 ==
+                gcry_cipher_open(handle, GCRY_CIPHER_TWOFISH,
+                                 GCRY_CIPHER_MODE_CFB, 0));
+  rc = gcry_cipher_setkey(*handle,
+                          sessionkey->twofish_key,
+                          sizeof(sessionkey->twofish_key));
+  GNUNET_assert((0 == rc) || ((char)rc == GPG_ERR_WEAK_KEY));
+  rc = gcry_cipher_setiv(*handle,
+                         iv->twofish_iv,
+                         sizeof(iv->twofish_iv));
+  GNUNET_assert((0 == rc) || ((char)rc == GPG_ERR_WEAK_KEY));
   return GNUNET_OK;
 }
 
@@ -122,24 +122,24 @@ setup_cipher_twofish (gcry_cipher_hd_t *handle,
  *          this size should be the same as @c len.
  */
 ssize_t
-GNUNET_CRYPTO_symmetric_encrypt (const void *block,
-                                 size_t size,
-                                 const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
-                                 const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
-                                 void *result)
+GNUNET_CRYPTO_symmetric_encrypt(const void *block,
+                                size_t size,
+                                const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
+                                const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
+                                void *result)
 {
   gcry_cipher_hd_t handle;
   char tmp[size];
 
-  if (GNUNET_OK != setup_cipher_aes (&handle, sessionkey, iv))
+  if (GNUNET_OK != setup_cipher_aes(&handle, sessionkey, iv))
     return -1;
-  GNUNET_assert (0 == gcry_cipher_encrypt (handle, tmp, size, block, size));
-  gcry_cipher_close (handle);
-  if (GNUNET_OK != setup_cipher_twofish (&handle, sessionkey, iv))
+  GNUNET_assert(0 == gcry_cipher_encrypt(handle, tmp, size, block, size));
+  gcry_cipher_close(handle);
+  if (GNUNET_OK != setup_cipher_twofish(&handle, sessionkey, iv))
     return -1;
-  GNUNET_assert (0 == gcry_cipher_encrypt (handle, result, size, tmp, size));
-  gcry_cipher_close (handle);
-  memset (tmp, 0, sizeof (tmp));
+  GNUNET_assert(0 == gcry_cipher_encrypt(handle, result, size, tmp, size));
+  gcry_cipher_close(handle);
+  memset(tmp, 0, sizeof(tmp));
   return size;
 }
 
@@ -158,24 +158,24 @@ GNUNET_CRYPTO_symmetric_encrypt (const void *block,
  *         this size should be the same as @c size.
  */
 ssize_t
-GNUNET_CRYPTO_symmetric_decrypt (const void *block,
-                                 size_t size,
-                                 const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
-                                 const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
-                                 void *result)
+GNUNET_CRYPTO_symmetric_decrypt(const void *block,
+                                size_t size,
+                                const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
+                                const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
+                                void *result)
 {
   gcry_cipher_hd_t handle;
   char tmp[size];
 
-  if (GNUNET_OK != setup_cipher_twofish (&handle, sessionkey, iv))
+  if (GNUNET_OK != setup_cipher_twofish(&handle, sessionkey, iv))
     return -1;
-  GNUNET_assert (0 == gcry_cipher_decrypt (handle, tmp, size, block, size));
-  gcry_cipher_close (handle);
-  if (GNUNET_OK != setup_cipher_aes (&handle, sessionkey, iv))
+  GNUNET_assert(0 == gcry_cipher_decrypt(handle, tmp, size, block, size));
+  gcry_cipher_close(handle);
+  if (GNUNET_OK != setup_cipher_aes(&handle, sessionkey, iv))
     return -1;
-  GNUNET_assert (0 == gcry_cipher_decrypt (handle, result, size, tmp, size));
-  gcry_cipher_close (handle);
-  memset (tmp, 0, sizeof (tmp));
+  GNUNET_assert(0 == gcry_cipher_decrypt(handle, result, size, tmp, size));
+  gcry_cipher_close(handle);
+  memset(tmp, 0, sizeof(tmp));
   return size;
 }
 
@@ -190,17 +190,17 @@ GNUNET_CRYPTO_symmetric_decrypt (const void *block,
  * @param ... pairs of void * & size_t for context chunks, terminated by NULL
  */
 void
-GNUNET_CRYPTO_symmetric_derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
-                                   const struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
-                                   const void *salt,
-                                   size_t salt_len,
-                                   ...)
+GNUNET_CRYPTO_symmetric_derive_iv(struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
+                                  const struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
+                                  const void *salt,
+                                  size_t salt_len,
+                                  ...)
 {
   va_list argp;
 
-  va_start (argp, salt_len);
-  GNUNET_CRYPTO_symmetric_derive_iv_v (iv, skey, salt, salt_len, argp);
-  va_end (argp);
+  va_start(argp, salt_len);
+  GNUNET_CRYPTO_symmetric_derive_iv_v(iv, skey, salt, salt_len, argp);
+  va_end(argp);
 }
 
 
@@ -214,33 +214,33 @@ GNUNET_CRYPTO_symmetric_derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationV
  * @param argp pairs of void * & size_t for context chunks, terminated by NULL
  */
 void
-GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
-                                     const struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
-                                     const void *salt,
-                                     size_t salt_len,
-                                     va_list argp)
+GNUNET_CRYPTO_symmetric_derive_iv_v(struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
+                                    const struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
+                                    const void *salt,
+                                    size_t salt_len,
+                                    va_list argp)
 {
   char aes_salt[salt_len + 4];
   char twofish_salt[salt_len + 4];
 
-  GNUNET_memcpy (aes_salt, salt, salt_len);
-  GNUNET_memcpy (&aes_salt[salt_len], "AES!", 4);
-  GNUNET_memcpy (twofish_salt, salt, salt_len);
-  GNUNET_memcpy (&twofish_salt[salt_len], "FISH", 4);
-  GNUNET_CRYPTO_kdf_v (iv->aes_iv,
-                       sizeof (iv->aes_iv),
-                       aes_salt,
-                       salt_len + 4,
-                       skey->aes_key,
-                       sizeof (skey->aes_key),
-                       argp);
-  GNUNET_CRYPTO_kdf_v (iv->twofish_iv,
-                       sizeof (iv->twofish_iv),
-                       twofish_salt,
-                       salt_len + 4,
-                       skey->twofish_key,
-                       sizeof (skey->twofish_key),
-                       argp);
+  GNUNET_memcpy(aes_salt, salt, salt_len);
+  GNUNET_memcpy(&aes_salt[salt_len], "AES!", 4);
+  GNUNET_memcpy(twofish_salt, salt, salt_len);
+  GNUNET_memcpy(&twofish_salt[salt_len], "FISH", 4);
+  GNUNET_CRYPTO_kdf_v(iv->aes_iv,
+                      sizeof(iv->aes_iv),
+                      aes_salt,
+                      salt_len + 4,
+                      skey->aes_key,
+                      sizeof(skey->aes_key),
+                      argp);
+  GNUNET_CRYPTO_kdf_v(iv->twofish_iv,
+                      sizeof(iv->twofish_iv),
+                      twofish_salt,
+                      salt_len + 4,
+                      skey->twofish_key,
+                      sizeof(skey->twofish_key),
+                      argp);
 }
 
 /* end of crypto_symmetric.c */