-rename files/symbols from _aes to _symmetric

6 files changed, 54 insertions, 54 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 6c1d8d785..934385663 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -75,7 +75,7 @@ libgnunetutil_la_SOURCES = \
   container_multihashmap.c \
   container_multihashmap32.c \
   container_slist.c \
-  crypto_aes.c \
+  crypto_symmetric.c \
   crypto_crc.c \
   crypto_ecc.c \
   crypto_hash.c \
@@ -189,7 +189,7 @@ libgnunet_plugin_test_la_LDFLAGS = \
 if HAVE_BENCHMARKS
  BENCHMARKS = \
   perf_crypto_hash \
-  perf_crypto_aes \
+  perf_crypto_symmetric \
   perf_malloc
 endif
 
@@ -206,7 +206,7 @@ check_PROGRAMS = \
  test_container_multihashmap32 \
  test_container_heap \
  test_container_slist \
- test_crypto_aes \
+ test_crypto_symmetric \
  test_crypto_crc \
  test_crypto_ecc \
  test_crypto_hash \
@@ -320,9 +320,9 @@ test_container_slist_SOURCES = \
 test_container_slist_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_crypto_aes_SOURCES = \
- test_crypto_aes.c
-test_crypto_aes_LDADD = \
+test_crypto_symmetric_SOURCES = \
+ test_crypto_symmetric.c
+test_crypto_symmetric_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_crypto_crc_SOURCES = \
@@ -494,9 +494,9 @@ perf_crypto_hash_SOURCES = \
 perf_crypto_hash_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-perf_crypto_aes_SOURCES = \
- perf_crypto_aes.c
-perf_crypto_aes_LDADD = \
+perf_crypto_symmetric_SOURCES = \
+ perf_crypto_symmetric.c
+perf_crypto_symmetric_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_malloc_SOURCES = \
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 47baf660f..e1997c3bb 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -395,16 +395,16 @@ GNUNET_CRYPTO_hash_xor (const struct GNUNET_HashCode * a, const struct GNUNET_Ha
  */
 void
 GNUNET_CRYPTO_hash_to_aes_key (const struct GNUNET_HashCode *hc,
-                               struct GNUNET_CRYPTO_AesSessionKey *skey,
-                               struct GNUNET_CRYPTO_AesInitializationVector *iv)
+                               struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
+                               struct GNUNET_CRYPTO_SymmetricInitializationVector *iv)
 {
   GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_AesSessionKey),
+                 GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey),
                                     "Hash key derivation", strlen ("Hash key derivation"),
                                     hc, sizeof (struct GNUNET_HashCode),
                                     NULL, 0));
   GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CRYPTO_kdf (iv, sizeof (struct GNUNET_CRYPTO_AesInitializationVector),
+                 GNUNET_CRYPTO_kdf (iv, sizeof (struct GNUNET_CRYPTO_SymmetricInitializationVector),
                                     "Initialization vector derivation", strlen ("Initialization vector derivation"),
                                     hc, sizeof (struct GNUNET_HashCode),
                                     NULL, 0));
@@ -521,7 +521,7 @@ GNUNET_CRYPTO_hash_xorcmp (const struct GNUNET_HashCode *h1,
  */
 void
 GNUNET_CRYPTO_hmac_derive_key (struct GNUNET_CRYPTO_AuthKey *key,
-                               const struct GNUNET_CRYPTO_AesSessionKey *rkey,
+                               const struct GNUNET_CRYPTO_SymmetricSessionKey *rkey,
                                const void *salt, size_t salt_len, ...)
 {
   va_list argp;
@@ -542,13 +542,13 @@ GNUNET_CRYPTO_hmac_derive_key (struct GNUNET_CRYPTO_AuthKey *key,
  */
 void
 GNUNET_CRYPTO_hmac_derive_key_v (struct GNUNET_CRYPTO_AuthKey *key,
-                                 const struct GNUNET_CRYPTO_AesSessionKey *rkey,
+                                 const struct GNUNET_CRYPTO_SymmetricSessionKey *rkey,
                                  const void *salt, size_t salt_len,
                                  va_list argp)
 {
   GNUNET_CRYPTO_kdf_v (key->key, sizeof (key->key), 
                        salt, salt_len, 
-                       rkey, sizeof (struct GNUNET_CRYPTO_AesSessionKey),
+                       rkey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey),
                        argp);
 }
 
diff --git a/src/util/crypto_aes.c b/src/util/crypto_symmetric.c
index 91c578ab8..3e4f9d748 100644
--- a/src/util/crypto_aes.c
+++ b/src/util/crypto_symmetric.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file util/crypto_aes.c
+ * @file util/crypto_symmetric.c
  * @brief Symmetric encryption services; combined cipher AES+TWOFISH (256-bit each)
  * @author Christian Grothoff
  * @author Ioana Patrascu
@@ -38,7 +38,7 @@
  * @param key session key to initialize
  */
 void
-GNUNET_CRYPTO_aes_create_session_key (struct GNUNET_CRYPTO_AesSessionKey *key)
+GNUNET_CRYPTO_symmetric_create_session_key (struct GNUNET_CRYPTO_SymmetricSessionKey *key)
 {
   gcry_randomize (key->aes_key, 
                   GNUNET_CRYPTO_AES_KEY_LENGTH,
@@ -59,8 +59,8 @@ GNUNET_CRYPTO_aes_create_session_key (struct GNUNET_CRYPTO_AesSessionKey *key)
  */
 static int
 setup_cipher_aes (gcry_cipher_hd_t *handle,
-                  const struct GNUNET_CRYPTO_AesSessionKey *sessionkey,
-                  const struct GNUNET_CRYPTO_AesInitializationVector *iv)
+                  const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
+                  const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv)
 {
   int rc;
 
@@ -89,8 +89,8 @@ setup_cipher_aes (gcry_cipher_hd_t *handle,
  */
 static int
 setup_cipher_twofish (gcry_cipher_hd_t *handle,
-                      const struct GNUNET_CRYPTO_AesSessionKey *sessionkey,
-                      const struct GNUNET_CRYPTO_AesInitializationVector *iv)
+                      const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
+                      const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv)
 {
   int rc;
 
@@ -122,10 +122,10 @@ setup_cipher_twofish (gcry_cipher_hd_t *handle,
  * @returns the size of the encrypted block, -1 for errors
  */
 ssize_t
-GNUNET_CRYPTO_aes_encrypt (const void *block, size_t len,
-                           const struct GNUNET_CRYPTO_AesSessionKey *
+GNUNET_CRYPTO_symmetric_encrypt (const void *block, size_t len,
+                           const struct GNUNET_CRYPTO_SymmetricSessionKey *
                            sessionkey,
-                           const struct GNUNET_CRYPTO_AesInitializationVector *
+                           const struct GNUNET_CRYPTO_SymmetricInitializationVector *
                            iv, void *result)
 {
   gcry_cipher_hd_t handle;
@@ -156,9 +156,9 @@ GNUNET_CRYPTO_aes_encrypt (const void *block, size_t len,
  * @return -1 on failure, size of decrypted block on success
  */
 ssize_t
-GNUNET_CRYPTO_aes_decrypt (const void *block, size_t size,
-                           const struct GNUNET_CRYPTO_AesSessionKey *sessionkey,
-                           const struct GNUNET_CRYPTO_AesInitializationVector *iv, 
+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;
@@ -187,14 +187,14 @@ GNUNET_CRYPTO_aes_decrypt (const void *block, size_t size,
  * @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,
+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_aes_derive_iv_v (iv, skey, salt, salt_len, argp);
+  GNUNET_CRYPTO_symmetric_derive_iv_v (iv, skey, salt, salt_len, argp);
   va_end (argp);
 }
 
@@ -209,8 +209,8 @@ GNUNET_CRYPTO_aes_derive_iv (struct GNUNET_CRYPTO_AesInitializationVector *iv,
  * @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,
+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];
diff --git a/src/util/perf_crypto_aes.c b/src/util/perf_crypto_symmetric.c
index f02335afe..9f4e2a938 100644
--- a/src/util/perf_crypto_aes.c
+++ b/src/util/perf_crypto_symmetric.c
@@ -20,7 +20,7 @@
 
 /**
  * @author Christian Grothoff
- * @file util/perf_crypto_aes.c
+ * @file util/perf_crypto_symmetric.c
  * @brief measure performance of encryption function
  */
 #include "platform.h"
@@ -35,19 +35,19 @@ perfEncrypt ()
   unsigned int i;
   char buf[64 * 1024];
   char rbuf[64 * 1024];
-  struct GNUNET_CRYPTO_AesSessionKey sk;
-  struct GNUNET_CRYPTO_AesInitializationVector iv;
+  struct GNUNET_CRYPTO_SymmetricSessionKey sk;
+  struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
 
-  GNUNET_CRYPTO_aes_create_session_key (&sk);
+  GNUNET_CRYPTO_symmetric_create_session_key (&sk);
 
   memset (buf, 1, sizeof (buf));
   for (i = 0; i < 1024; i++)
   {
     memset (&iv, (int8_t) i, sizeof (iv));
-    GNUNET_CRYPTO_aes_encrypt (buf, sizeof (buf),
+    GNUNET_CRYPTO_symmetric_encrypt (buf, sizeof (buf),
                                &sk, &iv,
                                rbuf);
-    GNUNET_CRYPTO_aes_decrypt (rbuf, sizeof (buf),
+    GNUNET_CRYPTO_symmetric_decrypt (rbuf, sizeof (buf),
                                &sk, &iv,
                                buf);
   }
diff --git a/src/util/test_crypto_hash.c b/src/util/test_crypto_hash.c
index 2a5d6d773..9e10702ce 100644
--- a/src/util/test_crypto_hash.c
+++ b/src/util/test_crypto_hash.c
@@ -69,8 +69,8 @@ testArithmetic ()
   struct GNUNET_HashCode h2;
   struct GNUNET_HashCode d;
   struct GNUNET_HashCode s;
-  struct GNUNET_CRYPTO_AesSessionKey skey;
-  struct GNUNET_CRYPTO_AesInitializationVector iv;
+  struct GNUNET_CRYPTO_SymmetricSessionKey skey;
+  struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
 
   GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &h1);
   GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &h2);
diff --git a/src/util/test_crypto_aes.c b/src/util/test_crypto_symmetric.c
index a5d49063a..b350e9efe 100644
--- a/src/util/test_crypto_aes.c
+++ b/src/util/test_crypto_symmetric.c
@@ -20,7 +20,7 @@
 */
 /**
  * @author Christian Grothoff
- * @file util/test_crypto_aes.c
+ * @file util/test_crypto_symmetric.c
  * @brief test for AES ciphers
  */
 #include "platform.h"
@@ -33,16 +33,16 @@
 static int
 testSymcipher ()
 {
-  struct GNUNET_CRYPTO_AesSessionKey key;
+  struct GNUNET_CRYPTO_SymmetricSessionKey key;
   char result[100];
   int size;
   char res[100];
 
-  GNUNET_CRYPTO_aes_create_session_key (&key);
+  GNUNET_CRYPTO_symmetric_create_session_key (&key);
   size =
-      GNUNET_CRYPTO_aes_encrypt (TESTSTRING, strlen (TESTSTRING) + 1, &key,
+      GNUNET_CRYPTO_symmetric_encrypt (TESTSTRING, strlen (TESTSTRING) + 1, &key,
                                  (const struct
-                                  GNUNET_CRYPTO_AesInitializationVector *)
+                                  GNUNET_CRYPTO_SymmetricInitializationVector *)
                                  INITVALUE, result);
   if (size == -1)
   {
@@ -50,9 +50,9 @@ testSymcipher ()
     return 1;
   }
   size =
-      GNUNET_CRYPTO_aes_decrypt (result, size, &key,
+      GNUNET_CRYPTO_symmetric_decrypt (result, size, &key,
                                  (const struct
-                                  GNUNET_CRYPTO_AesInitializationVector *)
+                                  GNUNET_CRYPTO_SymmetricInitializationVector *)
                                  INITVALUE, res);
   if (strlen (TESTSTRING) + 1 != size)
   {
@@ -72,7 +72,7 @@ testSymcipher ()
 static int
 verifyCrypto ()
 {
-  struct GNUNET_CRYPTO_AesSessionKey key;
+  struct GNUNET_CRYPTO_SymmetricSessionKey key;
   char result[GNUNET_CRYPTO_AES_KEY_LENGTH];
   char *res;
   int ret;
@@ -107,9 +107,9 @@ verifyCrypto ()
   memcpy (key.aes_key, raw_key_aes, GNUNET_CRYPTO_AES_KEY_LENGTH);
   memcpy (key.twofish_key, raw_key_twofish, GNUNET_CRYPTO_AES_KEY_LENGTH);
   if (GNUNET_CRYPTO_AES_KEY_LENGTH !=
-      GNUNET_CRYPTO_aes_encrypt (plain, GNUNET_CRYPTO_AES_KEY_LENGTH, &key,
+      GNUNET_CRYPTO_symmetric_encrypt (plain, GNUNET_CRYPTO_AES_KEY_LENGTH, &key,
                                  (const struct
-                                  GNUNET_CRYPTO_AesInitializationVector *)
+                                  GNUNET_CRYPTO_SymmetricInitializationVector *)
                                  "testtesttesttest", result))
   {
     printf ("Wrong return value from encrypt block.\n");
@@ -129,9 +129,9 @@ verifyCrypto ()
 
   res = GNUNET_malloc (GNUNET_CRYPTO_AES_KEY_LENGTH);
   if (GNUNET_CRYPTO_AES_KEY_LENGTH !=
-      GNUNET_CRYPTO_aes_decrypt (result, GNUNET_CRYPTO_AES_KEY_LENGTH, &key,
+      GNUNET_CRYPTO_symmetric_decrypt (result, GNUNET_CRYPTO_AES_KEY_LENGTH, &key,
                                  (const struct
-                                  GNUNET_CRYPTO_AesInitializationVector *)
+                                  GNUNET_CRYPTO_SymmetricInitializationVector *)
                                  "testtesttesttest", res))
   {
     printf ("Wrong return value from decrypt block.\n");
@@ -156,7 +156,7 @@ main (int argc, char *argv[])
 
   GNUNET_log_setup ("test-crypto-aes", "WARNING", NULL);
   GNUNET_assert (strlen (INITVALUE) >
-                 sizeof (struct GNUNET_CRYPTO_AesInitializationVector));
+                 sizeof (struct GNUNET_CRYPTO_SymmetricInitializationVector));
   failureCount += testSymcipher ();
   failureCount += verifyCrypto ();