From 2aab18117a2b078dd0eb366f3766a1fef06da695 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Fri, 25 Jun 2021 11:55:46 +0200 Subject: [PATCH] Add possibility to use libcrypto for encryption --- include/libhashkit-1.0/hashkit.h | 4 +- src/libhashkit/CMakeLists.txt | 9 +++ src/libhashkit/aes.cc | 121 +++++++++++++++++++++++++++++-- src/libhashkit/aes.h | 22 ++++++ src/libhashkit/encrypt.cc | 42 +++++++++-- src/libhashkit/hashkit.cc | 43 +++++++++-- src/libhashkit/rijndael.hpp | 2 +- src/libmemcached/is.h | 2 +- 8 files changed, 225 insertions(+), 20 deletions(-) diff --git a/include/libhashkit-1.0/hashkit.h b/include/libhashkit-1.0/hashkit.h index a05eb5f8..0f67e377 100644 --- a/include/libhashkit-1.0/hashkit.h +++ b/include/libhashkit-1.0/hashkit.h @@ -49,7 +49,7 @@ struct hashkit_st { bool is_allocated : 1; } options; - void *_key; + void *_cryptographic_context; }; #ifdef __cplusplus @@ -75,7 +75,7 @@ HASHKIT_API hashkit_string_st *hashkit_decrypt(hashkit_st *, const char *source, size_t source_length); HASHKIT_API -bool hashkit_key(hashkit_st *, const char *key, const size_t key_length); +bool hashkit_key(hashkit_st *kit, const char *key, const size_t key_length); #ifdef __cplusplus } // extern "C" diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt index 355afabb..d0e03d15 100644 --- a/src/libhashkit/CMakeLists.txt +++ b/src/libhashkit/CMakeLists.txt @@ -39,6 +39,15 @@ target_include_directories(libhashkit PUBLIC $ $ $) + +find_package(OpenSSL) +if(NOT OPENSSL_FOUND) + message(WARNING "crypto library not found") +else() + add_compile_definitions(WITH_OPENSSL) + target_link_libraries(libhashkit PUBLIC OpenSSL::Crypto) +endif() + configure_file(hashkitcon.h.in hashkitcon.h @ONLY) install(TARGETS libhashkit EXPORT libhashkit-targets diff --git a/src/libhashkit/aes.cc b/src/libhashkit/aes.cc index 0b2f73d8..d4fdad5a 100644 --- a/src/libhashkit/aes.cc +++ b/src/libhashkit/aes.cc @@ -15,12 +15,122 @@ #include "libhashkit/common.h" -#include "libhashkit/rijndael.hpp" - #include -#define AES_KEY_LENGTH 256 /* 128, 192, 256 */ -#define AES_BLOCK_SIZE 16 +#ifdef WITH_OPENSSL + +#include + +#define DIGEST_ROUNDS 5 + +#define AES_KEY_NBYTES 32 +#define AES_IV_NBYTES 32 + +bool aes_initialize(const unsigned char *key, const size_t key_length, + encryption_context_t *crypto_context) { + unsigned char aes_key[AES_KEY_NBYTES]; + unsigned char aes_iv[AES_IV_NBYTES]; + if (aes_key == NULL || aes_iv == NULL) { + return false; + } + + int i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha256(), NULL, key, key_length, DIGEST_ROUNDS, + aes_key, aes_iv); + if (i != AES_KEY_NBYTES) { + return false; + } + + EVP_CIPHER_CTX_init(crypto_context->encryption_context); + EVP_CIPHER_CTX_init(crypto_context->decryption_context); + if (EVP_EncryptInit_ex(crypto_context->encryption_context, EVP_aes_256_cbc(), NULL, key, aes_iv) + != 1 + || EVP_DecryptInit_ex(crypto_context->decryption_context, EVP_aes_256_cbc(), NULL, key, + aes_iv) + != 1) + { + return false; + } + return true; +} + +hashkit_string_st *aes_encrypt(encryption_context_t *crypto_context, const unsigned char *source, + size_t source_length) { +EVP_CIPHER_CTX *encryption_context = crypto_context->encryption_context; +int cipher_length = source_length + EVP_CIPHER_CTX_block_size(encryption_context); +int final_length = 0; +unsigned char *cipher_text = (unsigned char *) malloc(cipher_length); +if (cipher_text == NULL) { + return NULL; +} +if (EVP_EncryptInit_ex(encryption_context, NULL, NULL, NULL, NULL) != 1 + || EVP_EncryptUpdate(encryption_context, cipher_text, &cipher_length, source, source_length) + != 1 + || EVP_EncryptFinal_ex(encryption_context, cipher_text + cipher_length, &final_length) != 1) +{ + free(cipher_text); + return NULL; +} + +hashkit_string_st *destination = hashkit_string_create(cipher_length + final_length); +if (destination == NULL) { + return NULL; +} +char *dest = hashkit_string_c_str_mutable(destination); +memcpy(dest, cipher_text, cipher_length + final_length); +hashkit_string_set_length(destination, cipher_length + final_length); +return destination; +} + +hashkit_string_st *aes_decrypt(encryption_context_t *crypto_context, const unsigned char *source, + size_t source_length) { +EVP_CIPHER_CTX *decryption_context = crypto_context->decryption_context; +int plain_text_length = source_length; +int final_length = 0; +unsigned char *plain_text = (unsigned char *) malloc(plain_text_length); +if (plain_text == NULL) { + return NULL; +} +if (EVP_DecryptInit_ex(decryption_context, NULL, NULL, NULL, NULL) != 1 + || EVP_DecryptUpdate(decryption_context, plain_text, &plain_text_length, source, source_length) + != 1 + || EVP_DecryptFinal_ex(decryption_context, plain_text + plain_text_length, &final_length) != 1) +{ + free(plain_text); + return NULL; +} + +hashkit_string_st *destination = hashkit_string_create(plain_text_length + final_length); +if (destination == NULL) { + return NULL; +} +char *dest = hashkit_string_c_str_mutable(destination); +memcpy(dest, plain_text, plain_text_length + final_length); +hashkit_string_set_length(destination, plain_text_length + final_length); +return destination; +} + +encryption_context_t *aes_clone_cryptographic_context(encryption_context_t *source) { + encryption_context_t *new_context = (encryption_context_t *) malloc(sizeof(encryption_context_t)); + if (new_context == NULL) + return NULL; + + new_context->encryption_context = EVP_CIPHER_CTX_new(); + new_context->decryption_context = EVP_CIPHER_CTX_new(); + if (new_context->encryption_context == NULL || new_context->decryption_context == NULL) { + free(new_context); + return NULL; + } + EVP_CIPHER_CTX_copy(new_context->encryption_context, source->encryption_context); + EVP_CIPHER_CTX_copy(new_context->decryption_context, source->decryption_context); + return new_context; +} + +#else + +# include "libhashkit/rijndael.hpp" + +# define AES_KEY_LENGTH 256 /* 128, 192, 256 */ +# define AES_BLOCK_SIZE 16 enum encrypt_t { AES_ENCRYPT, AES_DECRYPT }; @@ -49,7 +159,7 @@ aes_key_t *aes_create_key(const char *key, const size_t key_length) { if (ptr == rkey_end) { ptr = rkey; /* Just loop over tmp_key until we used all key */ } - *ptr ^= (uint8_t)(*sptr); + *ptr ^= (uint8_t) (*sptr); } _aes_key->decode_key.nr = rijndaelKeySetupDec(_aes_key->decode_key.rk, rkey, AES_KEY_LENGTH); @@ -140,3 +250,4 @@ hashkit_string_st *aes_decrypt(aes_key_t *_aes_key, const char *source, size_t s return destination; } +#endif \ No newline at end of file diff --git a/src/libhashkit/aes.h b/src/libhashkit/aes.h index 43a18b35..e021c5f1 100644 --- a/src/libhashkit/aes.h +++ b/src/libhashkit/aes.h @@ -15,6 +15,27 @@ #pragma once +#ifdef WITH_OPENSSL + +#include + +typedef struct encryption_context { + EVP_CIPHER_CTX *encryption_context; + EVP_CIPHER_CTX *decryption_context; +} encryption_context_t; + +hashkit_string_st *aes_encrypt(encryption_context_t *crypto_context, const unsigned char *source, + size_t source_length); + +hashkit_string_st *aes_decrypt(encryption_context_t *crypto_context, const unsigned char *source, + size_t source_length); + +bool aes_initialize(const unsigned char *key, const size_t key_length, + encryption_context_t *crypto_context); + +encryption_context_t *aes_clone_cryptographic_context(encryption_context_t *source); +#else + struct aes_key_t; hashkit_string_st *aes_encrypt(aes_key_t *_aes_key, const char *source, size_t source_length); @@ -24,3 +45,4 @@ hashkit_string_st *aes_decrypt(aes_key_t *_aes_key, const char *source, size_t s aes_key_t *aes_create_key(const char *key, const size_t key_length); aes_key_t *aes_clone_key(aes_key_t *_aes_key); +#endif \ No newline at end of file diff --git a/src/libhashkit/encrypt.cc b/src/libhashkit/encrypt.cc index 6446c018..dbc051ae 100644 --- a/src/libhashkit/encrypt.cc +++ b/src/libhashkit/encrypt.cc @@ -15,20 +15,50 @@ #include "libhashkit/common.h" +#ifdef WITH_OPENSSL +# include +#endif + hashkit_string_st *hashkit_encrypt(hashkit_st *kit, const char *source, size_t source_length) { - return aes_encrypt(static_cast(kit->_key), source, source_length); +#ifdef WITH_OPENSSL + return aes_encrypt((encryption_context_t *) kit->_cryptographic_context, + (const unsigned char *) source, source_length); +#else + return aes_encrypt((aes_key_t *) kit->_cryptographic_context, source, + source_length); +#endif } hashkit_string_st *hashkit_decrypt(hashkit_st *kit, const char *source, size_t source_length) { - return aes_decrypt(static_cast(kit->_key), source, source_length); +#ifdef WITH_OPENSSL + return aes_decrypt((encryption_context_t *) kit->_cryptographic_context, + (const unsigned char *) source, source_length); +#else + return aes_decrypt((aes_key_t *)kit->_cryptographic_context, source, source_length); +#endif } +#ifdef WITH_OPENSSL +bool hashkit_key(hashkit_st *kit, const char *key, const size_t key_length) { + kit->_cryptographic_context = (encryption_context_t *) malloc(sizeof(encryption_context_t)); + ((encryption_context_t *) kit->_cryptographic_context)->encryption_context = EVP_CIPHER_CTX_new(); + ((encryption_context_t *) kit->_cryptographic_context)->decryption_context = EVP_CIPHER_CTX_new(); + if (((encryption_context_t *) kit->_cryptographic_context)->encryption_context == NULL + || ((encryption_context_t *) kit->_cryptographic_context)->decryption_context == NULL) + { + return false; + } + return aes_initialize((const unsigned char *) key, key_length, + (encryption_context_t *) kit->_cryptographic_context); +} +#else bool hashkit_key(hashkit_st *kit, const char *key, const size_t key_length) { - if (kit->_key) { - free(kit->_key); + if (kit->_cryptographic_context) { + free(kit->_cryptographic_context); } - kit->_key = aes_create_key(key, key_length); + kit->_cryptographic_context = aes_create_key(key, key_length); - return bool(kit->_key); + return bool(kit->_cryptographic_context); } +#endif \ No newline at end of file diff --git a/src/libhashkit/hashkit.cc b/src/libhashkit/hashkit.cc index 6a179573..46cf6368 100644 --- a/src/libhashkit/hashkit.cc +++ b/src/libhashkit/hashkit.cc @@ -15,6 +15,10 @@ #include "libhashkit/common.h" +#ifdef WITH_OPENSSL +# include +#endif + static inline void _hashkit_init(hashkit_st *self) { self->base_hash.function = hashkit_one_at_a_time; self->base_hash.context = NULL; @@ -23,7 +27,7 @@ static inline void _hashkit_init(hashkit_st *self) { self->distribution_hash.context = NULL; self->flags.is_base_same_distributed = true; - self->_key = NULL; + self->_cryptographic_context = NULL; } static inline hashkit_st *_hashkit_create(hashkit_st *self) { @@ -52,11 +56,26 @@ hashkit_st *hashkit_create(hashkit_st *self) { return self; } +#ifdef WITH_OPENSSL +static void cryptographic_context_free(encryption_context_t *context) { + EVP_CIPHER_CTX_free(context->encryption_context); + EVP_CIPHER_CTX_free(context->decryption_context); + free(context); +} +#endif + void hashkit_free(hashkit_st *self) { - if (self and self->_key) { - free(self->_key); - self->_key = NULL; +#ifdef WITH_OPENSSL + if (self and self->_cryptographic_context) { + cryptographic_context_free((encryption_context_t *)self->_cryptographic_context); + self->_cryptographic_context = NULL; + } +#else + if (self and self->_cryptographic_context) { + free(self->_cryptographic_context); + self->_cryptographic_context = NULL; } +#endif if (hashkit_is_allocated(self)) { free(self); @@ -79,7 +98,21 @@ hashkit_st *hashkit_clone(hashkit_st *destination, const hashkit_st *source) { destination->base_hash = source->base_hash; destination->distribution_hash = source->distribution_hash; destination->flags = source->flags; - destination->_key = aes_clone_key(static_cast(source->_key)); +#ifdef WITH_OPENSSL + if (destination->_cryptographic_context) { + cryptographic_context_free((encryption_context_t *)destination->_cryptographic_context); + destination->_cryptographic_context = NULL; + } + if (source->_cryptographic_context) { + destination->_cryptographic_context = + aes_clone_cryptographic_context(((encryption_context_t *) source->_cryptographic_context)); + if (destination->_cryptographic_context) { + + } + } +#else + destination->_cryptographic_context = aes_clone_key(static_cast(source->_cryptographic_context)); +#endif return destination; } diff --git a/src/libhashkit/rijndael.hpp b/src/libhashkit/rijndael.hpp index 96f48e34..96961f8c 100644 --- a/src/libhashkit/rijndael.hpp +++ b/src/libhashkit/rijndael.hpp @@ -35,4 +35,4 @@ void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16], u8 p #ifdef INTERMEDIATE_VALUE_KAT void rijndaelEncryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds); void rijndaelDecryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds); -#endif /* INTERMEDIATE_VALUE_KAT */ +#endif /* INTERMEDIATE_VALUE_KAT */ \ No newline at end of file diff --git a/src/libmemcached/is.h b/src/libmemcached/is.h index d73b54e7..3987332f 100644 --- a/src/libmemcached/is.h +++ b/src/libmemcached/is.h @@ -17,7 +17,7 @@ /* These are private */ #define memcached_is_allocated(__object) ((__object)->options.is_allocated) -#define memcached_is_encrypted(__object) ((__object)->hashkit._key) +#define memcached_is_encrypted(__object) (!!(__object)->hashkit._cryptographic_context) #define memcached_is_initialized(__object) ((__object)->options.is_initialized) #define memcached_is_purging(__object) ((__object)->state.is_purging) #define memcached_is_processing_input(__object) ((__object)->state.is_processing_input) -- 2.30.2