mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
a63ecdd3b1
New HEX() function. Final (?) cleanup of des_encrypt() / des_decrypt(). Added missing files to Makefiles. Docs/Makefile.am: Add missing files Docs/manual.texi: Added information about HEX() and des_encrypt() / des_decrypt(). include/mysql_com.h: Added FLUSH DES_KEY_FILE myisam/ft_update.c: Removed compiler warnings mysql-test/mysql-test-run.sh: Fixes needed for des_key tests. mysql-test/r/func_crypt.result: Moved crypt test from func_str to func_crypt mysql-test/r/func_encrypt.result: Moved crypt test from func_str to func_crypt mysql-test/r/func_str.result: Moved crypt test from func_str to func_crypt mysql-test/t/func_crypt.test: Moved crypt test from func_str to func_crypt mysql-test/t/func_encrypt.test: New tests mysql-test/t/func_str.test: Moved crypt test from func_str to func_crypt sql/des_key_file.cc: Changes needed for FLUSH DES_KEY_FILE sql/item_create.cc: New HEX() function sql/item_strfunc.cc: Changes needed for FLUSH DES_KEY_FILE sql/item_strfunc.h: New HEX() function sql/item_timefunc.cc: cleanup sql/lex.h: FLUSH DES_KEY_FILE sql/mysql_priv.h: FLUSH DES_KEY_FILE sql/mysqld.cc: FLUSH DES_KEY_FILE sql/sql_parse.cc: Cleanup sql_yacc.yy sql/sql_yacc.yy: Cleanup sql_yacc.yy
107 lines
3.2 KiB
C++
107 lines
3.2 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);
|
|
}
|
|
#endif /* HAVE_OPENSSL */
|