libhashkit/aes: simplify code

[awesomized/libmemcached] / src / libhashkit / encrypt.cc

diff --git a/src/libhashkit/encrypt.cc b/src/libhashkit/encrypt.cc
index effa299fbf7c0f396b2d840490a519ffcd74b289..ff269c05954a49cb7cba86c94621fea552c6a4de 100644 (file)
--- a/src/libhashkit/encrypt.cc
+++ b/src/libhashkit/encrypt.cc
@@ -15,50 +15,21 @@
 
 #include "libhashkit/common.h"
 
-#ifdef HAVE_OPENSSL_CRYPTO
-#  include <openssl/evp.h>
-#endif
-
 hashkit_string_st *hashkit_encrypt(hashkit_st *kit, const char *source, size_t source_length) {
-#ifdef HAVE_OPENSSL_CRYPTO
-  return aes_encrypt((encryption_context_t *) kit->_key,
-                     (const unsigned char *) source, source_length);
-#else
   return aes_encrypt((aes_key_t *) kit->_key, source,
                      source_length);
-#endif
 }
 
 hashkit_string_st *hashkit_decrypt(hashkit_st *kit, const char *source, size_t source_length) {
-#ifdef HAVE_OPENSSL_CRYPTO
-  return aes_decrypt((encryption_context_t *) kit->_key,
-                     (const unsigned char *) source, source_length);
-#else
   return aes_decrypt((aes_key_t *)kit->_key, source, source_length);
-#endif
 }
 
-#ifdef HAVE_OPENSSL_CRYPTO
-bool hashkit_key(hashkit_st *kit, const char *key, const size_t key_length) {
-  kit->_key = (encryption_context_t *) malloc(sizeof(encryption_context_t));
-  ((encryption_context_t *) kit->_key)->encryption_context = EVP_CIPHER_CTX_new();
-  ((encryption_context_t *) kit->_key)->decryption_context = EVP_CIPHER_CTX_new();
-  if (((encryption_context_t *) kit->_key)->encryption_context == NULL
-      || ((encryption_context_t *) kit->_key)->decryption_context == NULL)
-  {
-    return false;
-  }
-  return aes_initialize((const unsigned char *) key, key_length,
-                        (encryption_context_t *) kit->_key);
-}
-#else
 bool hashkit_key(hashkit_st *kit, const char *key, const size_t key_length) {
   if (kit->_key) {
-    free(kit->_key);
+    aes_free_key((aes_key_t *) kit->_key);
   }
 
   kit->_key = aes_create_key(key, key_length);
 
   return bool(kit->_key);
 }
-#endif