mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
84f81dc593
Call pthread_mutex_destroy() on not used mutex. Changed comments in .h and .c files from // -> /* */ Added detection of mutex on which one didn't call pthread_mutex_destroy() Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression" Added optimisation for ORDER BY NULL BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75: Delete: sql/ChangeLog BUILD/compile-pentium-valgrind-max: Don't use valgrind with safemalloc as this can hide some bugs Makefile.am: Added platform dirs bdb/os/os_handle.c: Portability fix client/mysql.cc: Fixes for Netware. Fixed duplicate output when using 'tee' Simple optimisations client/mysqldump.c: Portability fix client/mysqltest.c: Portability fix configure.in: Fixes for Netware extra/resolveip.c: Fixes for Netware include/Makefile.am: Fixes for Netware include/config-win.h: Portability fix include/my_global.h: Fixes for Netware include/my_net.h: Fixes for Netware include/my_pthread.h: Fixes for Netware Added detection of mutexes that was not destroyed include/my_sys.h: Fixes for Netware Added 'extern' before external functions include/mysql.h: Fixes for Netware innobase/configure.in: Fixes for Netware innobase/include/os0thread.h: Fixes for Netware innobase/os/os0sync.c: Fixes for Netware innobase/os/os0thread.c: Fixes for Netware innobase/srv/srv0srv.c: Fixes for Netware innobase/srv/srv0start.c: Fixes for Netware innobase/sync/sync0sync.c: Fixes for Netware isam/test3.c: Disable test on Netware libmysql/Makefile.shared: Added my_sleep libmysql/get_password.c: Fixes for Netware libmysql/libmysql.c: Fixes for Netware Made mysql_once_init() global libmysql/manager.c: Fixes for Netware myisam/mi_test3.c: Disable test for netware mysql-test/mysql-test-run.sh: Give warning if output file contains errors mysql-test/r/count_distinct.result: More tests mysql-test/r/group_by.result: Test of ORDER BY NULL mysql-test/t/backup.test: Fixes for Netware mysql-test/t/count_distinct.test: More tests mysql-test/t/func_crypt.test: Fixes for Netware mysql-test/t/grant_cache.test: Fixes for Netware mysql-test/t/group_by.test: Tests of ORDER BY NULL mysql-test/t/rpl000015.test: Fixes for Netware mysql-test/t/rpl000017.test: Fixes for Netware mysql-test/t/rpl_rotate_logs.test: Fixes for Netware mysys/Makefile.am: Added my_sleep.c and my_netware.c mysys/charset.c: Fixes for Netware mysys/default.c: Fixes for Netware mysys/mf_tempfile.c: Fixes for Netware mysys/my_clock.c: Fixes for Netware mysys/my_copy.c: Fixes for Netware mysys/my_getwd.c: Changed function comment from // -> /* */ mysys/my_init.c: Fixes for Netware mysys/my_lock.c: Fixes for Netware mysys/my_messnc.c: Fixes for Netware mysys/my_os2cond.c: Removed comment mysys/my_os2dirsrch.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2dirsrch.h: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2file64.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2mutex.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2thread.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2tls.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_pthread.c: Fixes for Netware mysys/my_redel.c: Fixes for Netware mysys/my_tempnam.c: Fixes for Netware mysys/my_thr_init.c: Remove created mutexes when program ends. mysys/mysys_priv.h: Cleanup mysys/safemalloc.c: Prefix error messages with "Error:" mysys/thr_alarm.c: Destroy internal mutex on end_thr_alarm. mysys/thr_mutex.c: Added detection of mutex on which one didn't call pthread_mutex_destroy() scripts/make_binary_distribution.sh: Fixes for Netware sql/des_key_file.cc: Free mutex at end sql/ha_innodb.cc: Free mutex at end sql/ha_myisam.cc: Changed warnings from REPAIR Note: (For mysql-test-run) sql/hostname.cc: Fixes for Netware sql/item.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/item_func.cc: Free used mutexes sql/item_sum.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/log.cc: Free used mutexes sql/my_lock.c: Fixes for Netware sql/mysql_priv.h: Fixes for Netware sql/mysqld.cc: Fixes for Netware Added Have_crypt Properly free mutexes from MYSQL_LOG by calling cleanup Free mutex before exit sql/repl_failsafe.cc: Fixes for Netware sql/set_var.cc: Added have_crypt sql/share/english/errmsg.txt: Added version socket and port to stderr log sql/slave.cc: Remove global MASTER_INFO variable and use instead an allocated variable. This allows us to correctly free used mutex. sql/slave.h: Move constructors and destuctors to slave.cc (To make it easier to clear all needed variables) sql/sql_base.cc: Safety fix sql/sql_class.h: Portability fixes. Added 'cleanup' to log handling to be able to free mutexes. sql/sql_insert.cc: Fixes for Netware mysys/my_sleep.c: E sql/sql_parse.cc: Fixes for Netware sql/sql_select.cc: Added optimisation for ORDER BY NULL sql/sql_select.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_table.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_udf.cc: Free mutex on end vio/test-ssl.c: Simple code cleanup vio/test-sslclient.c: Simple code cleanup vio/test-sslserver.c: Simple code cleanup vio/viotest-ssl.c: Simple code cleanup
118 lines
3.3 KiB
C++
118 lines
3.3 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;
|
|
pthread_mutex_t LOCK_des_key_file;
|
|
static int initialized;
|
|
|
|
/*
|
|
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
|
|
*/
|
|
|
|
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));
|
|
|
|
if (!initialized)
|
|
{
|
|
initialized=1;
|
|
pthread_mutex_init(&LOCK_des_key_file,MY_MUTEX_INIT_FAST);
|
|
}
|
|
|
|
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 ; isspace(*start) ; start++) ;
|
|
end=buf+length;
|
|
for (end=strend(buf) ; end > start && !isgraph(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);
|
|
}
|
|
|
|
|
|
void free_des_key_file()
|
|
{
|
|
if (initialized)
|
|
{
|
|
initialized= 01;
|
|
pthread_mutex_destroy(&LOCK_des_key_file);
|
|
}
|
|
}
|
|
|
|
#endif /* HAVE_OPENSSL */
|