emile: change the API to allow supporting other cipher in the future.

4 files changed, 25 insertions, 8 deletions

diff --git a/src/lib/emile/emile_cipher.c b/src/lib/emile/emile_cipher.c
index 544f271400..5e2db4a0e3 100644
--- a/src/lib/emile/emile_cipher.c
+++ b/src/lib/emile/emile_cipher.c
@@ -23,7 +23,8 @@ emile_binbuf_sha1(const char *key EINA_UNUSED,
 }
 
 EAPI Eina_Binbuf *
-emile_binbuf_cipher(const Eina_Binbuf *data EINA_UNUSED,
+emile_binbuf_cipher(Emile_Cipher_Algorithm algo EINA_UNUSED,
+                    const Eina_Binbuf *data EINA_UNUSED,
                     const char *key EINA_UNUSED,
                     unsigned int length EINA_UNUSED)
 {
@@ -31,7 +32,8 @@ emile_binbuf_cipher(const Eina_Binbuf *data EINA_UNUSED,
 }
 
 EAPI Eina_Binbuf *
-emile_binbuf_decipher(const Eina_Binbuf *data EINA_UNUSED,
+emile_binbuf_decipher(Emile_Cipher_Algorithm algo EINA_UNUSED,
+                      const Eina_Binbuf *data EINA_UNUSED,
                       const char *key EINA_UNUSED,
                       unsigned int length EINA_UNUSED)
 {
diff --git a/src/lib/emile/emile_cipher.h b/src/lib/emile/emile_cipher.h
index 1e2be24f24..ecf0952454 100644
--- a/src/lib/emile/emile_cipher.h
+++ b/src/lib/emile/emile_cipher.h
@@ -19,13 +19,20 @@ typedef enum
   EMILE_WANT_WRITE = 3
 } Emile_Want_Type;
 
+typedef enum
+{
+  EMILE_AES256_CBC
+} Emile_Cipher_Algorithm;
+
 EAPI Eina_Bool emile_cipher_init(void);
 EAPI const char *emile_cipher_module_get(void);
 
-EAPI Eina_Binbuf *emile_binbuf_cipher(const Eina_Binbuf *in,
+EAPI Eina_Binbuf *emile_binbuf_cipher(Emile_Cipher_Algorithm algo,
+                                      const Eina_Binbuf *in,
                                       const char *key, unsigned int length);
 
-EAPI Eina_Binbuf *emile_binbuf_decipher(const Eina_Binbuf *in,
+EAPI Eina_Binbuf *emile_binbuf_decipher(Emile_Cipher_Algorithm algo,
+                                        const Eina_Binbuf *in,
                                         const char *key, unsigned int length);
 
 EAPI Eina_Bool emile_binbuf_sha1(const char *key,
diff --git a/src/lib/emile/emile_cipher_gnutls.c b/src/lib/emile/emile_cipher_gnutls.c
index d51ae8bb9a..5cf85e4cc5 100644
--- a/src/lib/emile/emile_cipher_gnutls.c
+++ b/src/lib/emile/emile_cipher_gnutls.c
@@ -182,7 +182,8 @@ emile_binbuf_sha1(const char *key,
 }
 
 EAPI Eina_Binbuf *
-emile_binbuf_cipher(const Eina_Binbuf *data,
+emile_binbuf_cipher(Emile_Cipher_Algorithm algo,
+                    const Eina_Binbuf *data,
                     const char *key,
                     unsigned int length)
 {
@@ -200,6 +201,7 @@ emile_binbuf_cipher(const Eina_Binbuf *data,
    gcry_error_t err = 0;
    gcry_cipher_hd_t cipher;
 
+   if (algo != EMILE_AES256_CBC) return NULL;
    if (!emile_cipher_init()) return NULL;
 
    /* Gcrypt salt generation */
@@ -283,7 +285,8 @@ on_error:
 }
 
 EAPI Eina_Binbuf *
-emile_binbuf_decipher(const Eina_Binbuf *data,
+emile_binbuf_decipher(Emile_Cipher_Algorithm algo,
+                      const Eina_Binbuf *data,
                       const char *key,
                       unsigned int length)
 {
@@ -299,6 +302,7 @@ emile_binbuf_decipher(const Eina_Binbuf *data,
    int tmp_len;
    int tmp = 0;
 
+   if (algo != EMILE_AES256_CBC) return NULL;
    if (!emile_cipher_init()) return NULL;
 
    over = (unsigned int*) eina_binbuf_string_get(data);
diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c
index 46143d0b45..37dbc89a2e 100644
--- a/src/lib/emile/emile_cipher_openssl.c
+++ b/src/lib/emile/emile_cipher_openssl.c
@@ -71,7 +71,8 @@ emile_binbuf_sha1(const char *key,
 }
 
 EAPI Eina_Binbuf *
-emile_binbuf_cipher(const Eina_Binbuf *data,
+emile_binbuf_cipher(Emile_Cipher_Algorithm algo,
+                    const Eina_Binbuf *data,
                     const char *key,
                     unsigned int length)
 {
@@ -90,6 +91,7 @@ emile_binbuf_cipher(const Eina_Binbuf *data,
    unsigned int *buffer = NULL;
    int tmp_len;
 
+   if (algo != EMILE_AES256_CBC) return NULL;
    if (!emile_cipher_init()) return NULL;
 
    /* Openssl salt generation */
@@ -177,7 +179,8 @@ on_error:
 
 
 EAPI Eina_Binbuf *
-emile_binbuf_decipher(const Eina_Binbuf *data,
+emile_binbuf_decipher(Emile_Cipher_Algorithm algo,
+                      const Eina_Binbuf *data,
                       const char *key,
                       unsigned int length)
 {
@@ -193,6 +196,7 @@ emile_binbuf_decipher(const Eina_Binbuf *data,
    int tmp = 0;
    int opened = 0;
 
+   if (algo != EMILE_AES256_CBC) return NULL;
    if (!emile_cipher_init()) return NULL;
 
    over = (unsigned int*) eina_binbuf_string_get(data);