libhashkit/aes: simplify code

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

diff --git a/src/libhashkit/encrypt.cc b/src/libhashkit/encrypt.cc
index 95475d7bc8f105fb27be930fee87e8e41e35fe16..ff269c05954a49cb7cba86c94621fea552c6a4de 100644 (file)
--- a/src/libhashkit/encrypt.cc
+++ b/src/libhashkit/encrypt.cc
@@ -1,63 +1,35 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  Libhashkit library
- *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached-awesome - C/C++ Client Library for memcached          |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted under the terms of the BSD license.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
+    +--------------------------------------------------------------------+
+*/
 
+#include "libhashkit/common.h"
 
-#include <libhashkit/common.h>
-
-hashkit_string_st *hashkit_encrypt(hashkit_st *kit,
-                                   const char* source, size_t source_length)
-{
-  return aes_encrypt(static_cast<aes_key_t*>(kit->_key), source, source_length);
+hashkit_string_st *hashkit_encrypt(hashkit_st *kit, const char *source, size_t source_length) {
+  return aes_encrypt((aes_key_t *) kit->_key, source,
+                     source_length);
 }
 
-hashkit_string_st *hashkit_decrypt(hashkit_st *kit,
-                                   const char* source, size_t source_length)
-{
-  return aes_decrypt(static_cast<aes_key_t*>(kit->_key), source, source_length);
+hashkit_string_st *hashkit_decrypt(hashkit_st *kit, const char *source, size_t source_length) {
+  return aes_decrypt((aes_key_t *)kit->_key, source, source_length);
 }
 
-bool hashkit_key(hashkit_st *kit, const char *key, const size_t key_length)
-{
-  if (kit->_key)
-  {
-    free(kit->_key);
+bool hashkit_key(hashkit_st *kit, const char *key, const size_t key_length) {
+  if (kit->_key) {
+    aes_free_key((aes_key_t *) kit->_key);
   }
 
-  kit->_key= aes_create_key(key, key_length);
-  
+  kit->_key = aes_create_key(key, key_length);
+
   return bool(kit->_key);
 }
-