database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-7772: SIGSEGV on my_aes_encrypt_cbc when -DWITH_SSL=bundled

Browse Source 
Two problems:
- Read/Write outside of buffer at memcpy() because of incorrect parameters
. OPENSSL_assert(EVP_CIPHER_CTX_iv_length(&ctx.ctx) == iv_length); // ECB does not use IV, thus incorrect assertion

Added:
  mysql-test/include/encryption_algorithms.combinations to run tests with methods cbc, ecb and ctr in
  those systems where they are available (see suite.pm).
This commit is contained in:
Jan Lindström
2015-03-13 14:18:07 +02:00
parent 5e6f12366a
commit a3e68b4a55
13 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/include/encryption_algorithms.combinations Normal file
View File

@ -0,0 +1,8 @@
[cbc]
encryption-algorithm=aes_cbc
[ecb]
encryption-algorithm=aes_ecb
[ctr]
encryption-algorithm=aes_ctr

0
mysql-test/include/have_openssl_ctr.inc → mysql-test/include/encryption_algorithms.inc
View File

2
mysql-test/include/have_example_key_management_plugin.inc
View File

@ -1,3 +1,5 @@
-- source encryption_algorithms.inc
if (`select count(*) = 0 from information_schema.plugins
where plugin_name = 'example_key_management_plugin' and plugin_status='active'`)
{

2
mysql-test/include/have_file_key_management_plugin.inc
View File

@ -1,3 +1,5 @@
-- source encryption_algorithms.inc
if (`select count(*) = 0 from information_schema.plugins
where plugin_name = 'file_key_management_plugin' and plugin_status='active'`)
{

2
mysql-test/include/have_file_key_management_plugin.opt
View File

@ -1,4 +1,4 @@
--plugin-load-add=$FILE_KEY_MANAGEMENT_PLUGIN_SO
--loose-file-key-management-plugin
--loose-file-key-management-plugin-filename=$MYSQL_TEST_DIR/std_data/keys.txt
--encryption-algorithm=aes_cbc

1
mysql-test/include/have_openssl_ctr.opt
View File

@ -1 +0,0 @@
--encryption-algorithm=aes_ctr

2
mysql-test/suite.pm
View File

@ -66,7 +66,7 @@ sub skip_combinations {
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
and $1 ge "1.0.1";
$skip{'include/have_openssl_ctr.inc'} = 'no or too old openssl'
$skip{'include/encryption_algorithms.combinations'} = [ 'ctr' ]
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
and $1 ge "1.0.1";

1
mysql-test/suite/innodb/t/innodb-page_encryption_log_encryption.opt
View File

@ -1,2 +1 @@
--encryption-algorithm=aes_cbc
--innodb-encrypt-log

1
mysql-test/suite/innodb/t/innodb_encryption-page-compression.test
View File

@ -1,5 +1,4 @@
-- source include/have_innodb.inc
-- source include/have_openssl_ctr.inc
-- source include/have_example_key_management_plugin.inc
# embedded does not support restart

2
mysql-test/suite/innodb/t/innodb_encryption.opt
View File

@ -4,4 +4,4 @@
--innodb-encryption-rotate-key-age=15
--innodb-encryption-threads=4
--innodb-tablespaces-encryption
--encryption-algorithm=aes_ctr

1
mysql-test/suite/innodb/t/innodb_encryption.test
View File

@ -3,7 +3,6 @@
#
-- source include/have_innodb.inc
-- source include/have_example_key_management_plugin.inc
-- source include/have_openssl_ctr.inc
# embedded does not support restart
-- source include/not_embedded.inc

1
mysql-test/suite/innodb/t/innodb_encryption_tables.test
View File

@ -1,6 +1,5 @@
-- source include/have_innodb.inc
-- source include/have_example_key_management_plugin.inc
-- source include/have_openssl_ctr.inc
--source include/not_embedded.inc
--disable_query_log

36
mysys_ssl/my_aes.cc
View File

@ -255,12 +255,12 @@ static int my_aes_encrypt_cbc(const uchar* source, uint32 source_length,
}
if (noPadding) {
if (remaining_bytes!=0) {
memcpy(dest + source_length, source + source_length, remaining_bytes);
}
if (remaining_bytes!=0) {
/* Note that we moved the original pointers above */
memcpy(dest, source, remaining_bytes);
}
*dest_length = MY_AES_BLOCK_SIZE * (num_blocks) + remaining_bytes;
return AES_OK;
}
/* Encode the rest. We always have incomplete block */
@ -383,12 +383,12 @@ static int my_aes_encrypt_ecb(const uchar* source, uint32 source_length,
}
if (noPadding) {
if (remaining_bytes!=0) {
memcpy(dest + source_length, source + source_length, remaining_bytes);
}
*dest_length = MY_AES_BLOCK_SIZE * (num_blocks) + remaining_bytes;
if (remaining_bytes!=0) {
/* Note that we moved the original pointers above */
memcpy(dest, source, remaining_bytes);
}
*dest_length = MY_AES_BLOCK_SIZE * (num_blocks) + remaining_bytes;
return AES_OK;
}
/* Encode the rest. We always have incomplete block */
@ -430,7 +430,8 @@ static int my_aes_encrypt_ecb(const uchar* source, uint32 source_length,
}
EVP_CIPHER_CTX_key_length(&ctx.ctx);
OPENSSL_assert(EVP_CIPHER_CTX_key_length(&ctx.ctx) == key_length);
OPENSSL_assert(EVP_CIPHER_CTX_iv_length(&ctx.ctx) == iv_length);
// ECB does not use IV
OPENSSL_assert(EVP_CIPHER_CTX_iv_length(&ctx.ctx) == 0);
OPENSSL_assert(EVP_CIPHER_CTX_block_size(&ctx.ctx) == 16);
if (! EVP_EncryptUpdate(&ctx.ctx, (unsigned char *) dest, &u_len,
(unsigned const char *) source, source_length))
@ -438,9 +439,9 @@ static int my_aes_encrypt_ecb(const uchar* source, uint32 source_length,
if (! EVP_EncryptFinal_ex(&ctx.ctx, (unsigned char *) dest + u_len, &f_len))
return AES_BAD_DATA; /* Error */
if (remaining_bytes!=0) {
memcpy(dest + source_length, source + source_length, remaining_bytes);
}
if (remaining_bytes!=0)
memcpy(dest + source_length, source + source_length, remaining_bytes);
*dest_length = (unsigned long int) (u_len + f_len + remaining_bytes);
return AES_OK;
@ -524,7 +525,8 @@ static int my_aes_decrypt_cbc(const uchar* source, uint32 source_length,
if (noPadding) {
memcpy(dest, block, MY_AES_BLOCK_SIZE);
if (remaining_bytes!=0) {
memcpy(dest + source_length, source + source_length, remaining_bytes);
/* Note that we have moved dest and source */
memcpy(dest + MY_AES_BLOCK_SIZE, source + MY_AES_BLOCK_SIZE, remaining_bytes);
}
*dest_length = MY_AES_BLOCK_SIZE * num_blocks + remaining_bytes;
return AES_OK;
@ -656,7 +658,8 @@ static int my_aes_decrypt_ecb(const uchar* source, uint32 source_length,
if (noPadding) {
memcpy(dest, block, MY_AES_BLOCK_SIZE);
if (remaining_bytes!=0) {
memcpy(dest + source_length, source + source_length, remaining_bytes);
/* Note that we have moved dest and source */
memcpy(dest + MY_AES_BLOCK_SIZE, source + MY_AES_BLOCK_SIZE, remaining_bytes);
}
*dest_length = MY_AES_BLOCK_SIZE * num_blocks + remaining_bytes;
return AES_OK;
@ -699,7 +702,8 @@ static int my_aes_decrypt_ecb(const uchar* source, uint32 source_length,
EVP_CIPHER_CTX_set_padding(&ctx.ctx, 0);
}
OPENSSL_assert(EVP_CIPHER_CTX_key_length(&ctx.ctx) == key_length);
OPENSSL_assert(EVP_CIPHER_CTX_iv_length(&ctx.ctx) == iv_length);
// ECB does not use IV
OPENSSL_assert(EVP_CIPHER_CTX_iv_length(&ctx.ctx) == 0);
OPENSSL_assert(EVP_CIPHER_CTX_block_size(&ctx.ctx) == 16);
if (! EVP_DecryptUpdate(&ctx.ctx, (unsigned char *) dest, &u_len,
(unsigned char *)source, source_length))