* Rename (encrypt|descrypt)_binary to aes_(encrypt|decrypt)_ecb_binary

src/binary.c

@@ -421,9 +421,9 @@ static void edpack(settings_t *incfg, const char *in_hash, int what)
   size_t len = 0;
 
   if (what == PACK_ENC)
-    enc_dec_string = encrypt_binary;
+    enc_dec_string = aes_encrypt_ecb_binary;
   else
-    enc_dec_string = decrypt_binary;
+    enc_dec_string = aes_decrypt_ecb_binary;
 
 #define dofield(_field) 		do {							\
 	if (_field) {										\

src/crypt.c

@@ -22,7 +22,7 @@ char *encrypt_string(const char *keydata, char *in)
   char *res = NULL;
 
   len = strlen(in);
-  bdata = encrypt_binary(keydata, (unsigned char *) in, &len);
+  bdata = aes_encrypt_ecb_binary(keydata, (unsigned char *) in, &len);
   if (keydata && *keydata) {
     res = b64enc(bdata, &len);
     OPENSSL_cleanse(bdata, len);
@@ -42,7 +42,7 @@ char *encrypt_string(const char *keydata, char *in)
 bd::String encrypt_string(const bd::String& key, const bd::String& data) {
   if (!key) return data;
   size_t len = data.length();
-  char *bdata = (char*) encrypt_binary(key.c_str(), (unsigned char*) data.c_str(), &len);
+  char *bdata = (char*) aes_encrypt_ecb_binary(key.c_str(), (unsigned char*) data.c_str(), &len);
   bd::String encrypted(bdata, len);
   free(bdata);
   return encrypted;
@@ -55,7 +55,7 @@ char *decrypt_string(const char *keydata, char *in)
 
   if (keydata && *keydata) {
     buf = b64dec((const unsigned char *) in, &len);
-    res = (char *) decrypt_binary(keydata, (unsigned char *) buf, &len);
+    res = (char *) aes_decrypt_ecb_binary(keydata, (unsigned char *) buf, &len);
     OPENSSL_cleanse(buf, len);
     free(buf);
     return res;
@@ -75,7 +75,7 @@ char *decrypt_string(const char *keydata, char *in)
 bd::String decrypt_string(const bd::String& key, const bd::String& data) {
   if (!key) return data;
   size_t len = data.length();
-  char *bdata = (char*) decrypt_binary(key.c_str(), (unsigned char*) data.c_str(), &len);
+  char *bdata = (char*) aes_decrypt_ecb_binary(key.c_str(), (unsigned char*) data.c_str(), &len);
   bd::String decrypted(bdata, len);
   free(bdata);
   return decrypted;

src/crypto/aes_util.c

@@ -12,7 +12,7 @@
 AES_KEY e_key, d_key;
 
 unsigned char *
-encrypt_binary(const char *keydata, unsigned char *in, size_t *inlen)
+aes_encrypt_ecb_binary(const char *keydata, unsigned char *in, size_t *inlen)
 {
   size_t len = *inlen;
   int blocks = 0, block = 0;
@@ -46,7 +46,7 @@ encrypt_binary(const char *keydata, unsigned char *in, size_t *inlen)
 }
 
 unsigned char *
-decrypt_binary(const char *keydata, unsigned char *in, size_t *len)
+aes_decrypt_ecb_binary(const char *keydata, unsigned char *in, size_t *len)
 {
   int blocks = 0, block = 0;
   unsigned char *out = NULL;

src/crypto/aes_util.h

@@ -4,6 +4,6 @@
 
 #ifndef _AES_UTIL_H
 #define _AES_UTIL_H 1
-unsigned char *encrypt_binary(const char *, unsigned char *, size_t *);
-unsigned char *decrypt_binary(const char *, unsigned char *, size_t *);
+unsigned char *aes_encrypt_ecb_binary(const char *, unsigned char *, size_t *);
+unsigned char *aes_decrypt_ecb_binary(const char *, unsigned char *, size_t *);
 #endif