mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
3a31f7b91f
include/my_global.h: Added floatget() to read unaligned flaot mysql-test/r/select.result: Added test for found_rows() mysql-test/t/select.test: Added test for found_rows() sql/des_key_file.cc: Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition sql/field_conv.cc: Added optimizzed varsion of do_cut_string (for simple character sets) sql/item_func.cc: Simplify code (and ensure DBUG_ENTER is excuted before main code) sql/item_strfunc.cc: Safe calculation of max_length This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH) Remove init_des_key_file() as this is not initialized in mysqld.cc sql/item_timefunc.cc: Safe calculation of max_length This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH) sql/log_event.cc: Simplify code sql/mysql_priv.h: Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition sql/mysqld.cc: Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition Revert wrong patch of calling close_connection() in first close_connections() loop. (Bug #7403) Instead we now print a warning for closed connections only if mysqld is sarted with --warnings Added comments to make the close_connections() logic clearer sql/sql_prepare.cc: Use floatget() and doubleget() to protect against unaligned data sql/sql_select.cc: Fixed some cases unlikely cases where found_rows() would return wrong for queries that would return 0 or 1 rows
102 lines
3.1 KiB
C++
102 lines
3.1 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include <mysql_priv.h>
|
|
#include <m_ctype.h>
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
|
|
struct st_des_keyschedule des_keyschedule[10];
|
|
uint des_default_key;
|
|
|
|
/*
|
|
Function which loads DES keys from plaintext file into memory on MySQL
|
|
server startup and on command FLUSH DES_KEY_FILE.
|
|
Blame tonu@spam.ee on bugs ;)
|
|
|
|
RETURN
|
|
0 ok
|
|
1 Error
|
|
*/
|
|
|
|
#define des_cs &my_charset_latin1
|
|
|
|
bool
|
|
load_des_key_file(const char *file_name)
|
|
{
|
|
bool result=1;
|
|
File file;
|
|
IO_CACHE io;
|
|
DBUG_ENTER("load_des_key_file");
|
|
DBUG_PRINT("enter",("name: %s",file_name));
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_des_key_file));
|
|
if ((file=my_open(file_name,O_RDONLY | O_BINARY ,MYF(MY_WME))) < 0 ||
|
|
init_io_cache(&io, file, IO_SIZE*2, READ_CACHE, 0, 0, MYF(MY_WME)))
|
|
goto error;
|
|
|
|
bzero((char*) des_keyschedule,sizeof(struct st_des_keyschedule) * 10);
|
|
des_default_key=15; // Impossible key
|
|
for (;;)
|
|
{
|
|
char *start, *end;
|
|
char buf[1024], offset;
|
|
st_des_keyblock keyblock;
|
|
uint length;
|
|
|
|
if (!(length=my_b_gets(&io,buf,sizeof(buf)-1)))
|
|
break; // End of file
|
|
offset=buf[0];
|
|
if (offset >= '0' && offset <= '9') // If ok key
|
|
{
|
|
offset=(char) (offset - '0');
|
|
// Remove newline and possible other control characters
|
|
for (start=buf+1 ; my_isspace(des_cs, *start) ; start++) ;
|
|
end=buf+length;
|
|
for (end=strend(buf) ;
|
|
end > start && !my_isgraph(des_cs, end[-1]) ; end--) ;
|
|
|
|
if (start != end)
|
|
{
|
|
DES_cblock ivec;
|
|
bzero((char*) &ivec,sizeof(ivec));
|
|
// We make good 24-byte (168 bit) key from given plaintext key with MD5
|
|
EVP_BytesToKey(EVP_des_ede3_cbc(),EVP_md5(),NULL,
|
|
(uchar *) start, (int) (end-start),1,
|
|
(uchar *) &keyblock,
|
|
ivec);
|
|
DES_set_key_unchecked(&keyblock.key1,&(des_keyschedule[(int)offset].ks1));
|
|
DES_set_key_unchecked(&keyblock.key2,&(des_keyschedule[(int)offset].ks2));
|
|
DES_set_key_unchecked(&keyblock.key3,&(des_keyschedule[(int)offset].ks3));
|
|
if (des_default_key == 15)
|
|
des_default_key= (uint) offset; // use first as def.
|
|
}
|
|
}
|
|
else if (offset != '#')
|
|
sql_print_error("load_des_file: Found wrong key_number: %c",offset);
|
|
}
|
|
result=0;
|
|
|
|
error:
|
|
if (file >= 0)
|
|
{
|
|
my_close(file,MYF(0));
|
|
end_io_cache(&io);
|
|
}
|
|
VOID(pthread_mutex_unlock(&LOCK_des_key_file));
|
|
DBUG_RETURN(result);
|
|
}
|
|
#endif /* HAVE_OPENSSL */
|