hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Binlog encryption check against openssl 1.0

Browse Source 
AES_CTR routines are part of openssl 1.0.

If an old library is in use the AES_CTR cannot be specified for
encryption.

Additionally compilation is done without errors.
This commit is contained in:
MassimilianoPinto
2017-01-04 15:15:40 +01:00
parent 8d219bf8f5
commit 83957a503c
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/routing/binlogrouter/blr_file.c
View File

@ -77,6 +77,8 @@
* @param klen The AES Key len * @param klen The AES Key len
* @return The EVP_AES_CTR routine for key len * @return The EVP_AES_CTR routine for key len
*/ */
#if OPENSSL_VERSION_NUMBER > 0x10000000L
static inline const EVP_CIPHER *aes_ctr(unsigned int klen) static inline const EVP_CIPHER *aes_ctr(unsigned int klen)
{ {
switch (klen) switch (klen)
@ -87,6 +89,7 @@ static inline const EVP_CIPHER *aes_ctr(unsigned int klen)
default: return 0; default: return 0;
} }
} }
#endif
/** /**
* AES_CBC handling * AES_CBC handling
@ -128,12 +131,21 @@ static inline const EVP_CIPHER *aes_ecb(uint klen)
const EVP_CIPHER *(*ciphers[])(unsigned int) = const EVP_CIPHER *(*ciphers[])(unsigned int) =
{ {
aes_cbc, aes_cbc,
#if OPENSSL_VERSION_NUMBER > 0x10000000L
aes_ctr, aes_ctr,
#else
NULL,
#endif
aes_ecb aes_ecb
}; };
#if OPENSSL_VERSION_NUMBER > 0x10000000L
static const char *blr_encryption_algorithm_names[BINLOG_MAX_CRYPTO_SCHEME] = {"aes_cbc", "aes_ctr"}; static const char *blr_encryption_algorithm_names[BINLOG_MAX_CRYPTO_SCHEME] = {"aes_cbc", "aes_ctr"};
static const char blr_encryption_algorithm_list_names[] = "aes_cbc, aes_ctr"; static const char blr_encryption_algorithm_list_names[] = "aes_cbc, aes_ctr";
#else
static const char *blr_encryption_algorithm_names[BINLOG_MAX_CRYPTO_SCHEME] = {"aes_cbc"};
static const char blr_encryption_algorithm_list_names[] = "aes_cbc";
#endif
static int blr_file_create(ROUTER_INSTANCE *router, char *file); static int blr_file_create(ROUTER_INSTANCE *router, char *file);
static void blr_log_header(int priority, char *msg, uint8_t *ptr); static void blr_log_header(int priority, char *msg, uint8_t *ptr);
@ -2989,11 +3001,12 @@ int blr_check_encryption_algorithm(char *name)
{ {
return BLR_AES_CBC; return BLR_AES_CBC;
} }
#if OPENSSL_VERSION_NUMBER > 0x10000000L
if (strcasecmp(name, "aes_ctr") == 0) if (strcasecmp(name, "aes_ctr") == 0)
{ {
return BLR_AES_CTR; return BLR_AES_CTR;
} }
#endif
} }
return -1; return -1;