mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
f3e4ce926d
into mysql.com:/home/kent/bk/main/mysql-5.1 BUILD/Makefile.am: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~10: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~11: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~12: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~13: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~14: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~15: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~3: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~4: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~5: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~6: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~7: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~8: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~9: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713: Auto merged BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c: Auto merged BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f: Auto merged BitKeeper/deleted/.del-Makefile.in: Auto merged BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1: Auto merged BitKeeper/deleted/.del-build-vs71.bat: Auto merged BitKeeper/deleted/.del-build-vs8.bat: Auto merged BitKeeper/deleted/.del-configure.js: Auto merged BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9: Auto merged BitKeeper/deleted/.del-ha_berkeley.cc: Auto merged BitKeeper/deleted/.del-ha_berkeley.h: Auto merged BitKeeper/deleted/.del-make_win_bin_dist: Auto merged BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1: Auto merged BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb: Auto merged BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57: Auto merged BitKeeper/deleted/.del-mysql_thr.c~20772782813d1274: Auto merged BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef: Auto merged BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Auto merged BitKeeper/deleted/.del-prepare~773a10a535120a7e: Auto merged BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758: Auto merged BitKeeper/deleted/.del-sql_manager.h: Auto merged BitKeeper/deleted/.del-thr_test.c~70fc0971c72f2a95: Auto merged Docs/Makefile.am: Auto merged Docs/generate-text-files.pl: Auto merged client/Makefile.am: Auto merged client/client_priv.h: Auto merged client/mysqladmin.cc: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged dbug/Makefile.am: Auto merged extra/Makefile.am: Auto merged extra/yassl/taocrypt/benchmark/Makefile.am: Auto merged extra/yassl/taocrypt/test/Makefile.am: Auto merged include/Makefile.am: Auto merged include/my_time.h: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/embedded_priv.h: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/install_test_db.sh: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/lib/mtr_match.pl: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/ndb/ndbcluster.sh: Auto merged mysys/Makefile.am: Auto merged mysys/my_gethostbyname.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_handler.c: Auto merged regex/Makefile.am: Auto merged scripts/Makefile.am: Auto merged scripts/fill_func_tables.sh: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysql_convert_table_format.sh: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged scripts/mysql_install_db.sh: Auto merged server-tools/instance-manager/IMService.cpp: Auto merged server-tools/instance-manager/WindowsService.cpp: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/log.cc: Auto merged server-tools/instance-manager/log.h: Auto merged server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/messages.cc: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged server-tools/instance-manager/mysqlmanager.cc: Auto merged server-tools/instance-manager/options.cc: Auto merged server-tools/instance-manager/options.h: Auto merged server-tools/instance-manager/portability.h: Auto merged server-tools/instance-manager/priv.cc: Auto merged server-tools/instance-manager/protocol.cc: Auto merged server-tools/instance-manager/protocol.h: Auto merged server-tools/instance-manager/thread_registry.cc: Auto merged server-tools/instance-manager/thread_registry.h: Auto merged server-tools/instance-manager/user_map.cc: Auto merged server-tools/instance-manager/user_map.h: Auto merged sql/Makefile.am: Auto merged sql/discover.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/init.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.h: Auto merged sql/item_geofunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.h: Auto merged sql/item_uniq.cc: Auto merged sql/key.cc: Auto merged sql/lex_symbol.h: Auto merged sql/lock.cc: Auto merged sql/log_event.h: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/my_lock.c: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/password.c: Auto merged sql/procedure.h: Auto merged sql/protocol.h: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.h: Auto merged sql/spatial.h: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_crypt.cc: Auto merged sql/sql_cursor.cc: Auto merged sql/sql_do.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_manager.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql-bench/Makefile.am: Auto merged sql-bench/as3ap.sh: Auto merged sql-bench/bench-count-distinct.sh: Auto merged sql-bench/bench-init.pl.sh: Auto merged sql-bench/compare-results.sh: Auto merged sql-bench/copy-db.sh: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/run-all-tests.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-ATIS.sh: Auto merged sql-bench/test-alter-table.sh: Auto merged sql-bench/test-big-tables.sh: Auto merged sql-bench/test-connect.sh: Auto merged sql-bench/test-create.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-select.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql-bench/test-wisconsin.sh: Auto merged sql-common/my_time.c: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_test.cc: Auto merged sql/sql_update.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: Auto merged storage/federated/ha_federated.cc: Auto merged storage/heap/Makefile.am: Auto merged storage/heap/_check.c: Auto merged storage/heap/_rectest.c: Auto merged storage/heap/ha_heap.cc: Auto merged storage/heap/ha_heap.h: Auto merged storage/heap/heapdef.h: Auto merged storage/heap/hp_block.c: Auto merged storage/heap/hp_clear.c: Auto merged storage/heap/hp_close.c: Auto merged storage/heap/hp_create.c: Auto merged storage/heap/hp_delete.c: Auto merged storage/heap/hp_extra.c: Auto merged storage/heap/hp_hash.c: Auto merged storage/heap/hp_info.c: Auto merged storage/heap/hp_open.c: Auto merged storage/heap/hp_panic.c: Auto merged storage/heap/hp_rename.c: Auto merged storage/heap/hp_rfirst.c: Auto merged storage/heap/hp_rkey.c: Auto merged storage/heap/hp_rlast.c: Auto merged storage/heap/hp_rnext.c: Auto merged storage/heap/hp_rprev.c: Auto merged storage/heap/hp_rrnd.c: Auto merged storage/heap/hp_rsame.c: Auto merged storage/heap/hp_scan.c: Auto merged storage/heap/hp_static.c: Auto merged storage/heap/hp_test1.c: Auto merged storage/heap/hp_test2.c: Auto merged storage/heap/hp_update.c: Auto merged storage/heap/hp_write.c: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/btr/Makefile.am: Auto merged storage/innobase/buf/Makefile.am: Auto merged storage/innobase/data/Makefile.am: Auto merged storage/innobase/dict/Makefile.am: Auto merged storage/innobase/dyn/Makefile.am: Auto merged storage/innobase/eval/Makefile.am: Auto merged storage/innobase/fil/Makefile.am: Auto merged storage/innobase/fsp/Makefile.am: Auto merged storage/innobase/fut/Makefile.am: Auto merged storage/innobase/ha/Makefile.am: Auto merged storage/innobase/ibuf/Makefile.am: Auto merged storage/innobase/lock/Makefile.am: Auto merged storage/innobase/log/Makefile.am: Auto merged storage/innobase/mach/Makefile.am: Auto merged storage/innobase/mem/Makefile.am: Auto merged storage/innobase/mtr/Makefile.am: Auto merged storage/innobase/os/Makefile.am: Auto merged storage/innobase/page/Makefile.am: Auto merged storage/innobase/pars/Makefile.am: Auto merged storage/innobase/que/Makefile.am: Auto merged storage/innobase/read/Makefile.am: Auto merged storage/innobase/rem/Makefile.am: Auto merged storage/innobase/row/Makefile.am: Auto merged storage/innobase/srv/Makefile.am: Auto merged storage/innobase/sync/Makefile.am: Auto merged storage/innobase/thr/Makefile.am: Auto merged storage/innobase/trx/Makefile.am: Auto merged storage/innobase/usr/Makefile.am: Auto merged storage/innobase/ut/Makefile.am: Auto merged storage/myisam/Makefile.am: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_eval.c: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_static.c: Auto merged storage/myisam/ft_stem.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_test1.c: Auto merged storage/myisam/ft_test1.h: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/ftdefs.h: Auto merged storage/myisam/fulltext.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_cache.c: Auto merged storage/myisam/mi_changed.c: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_checksum.c: Auto merged storage/myisam/mi_close.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_dbug.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_delete_table.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_info.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_page.c: Auto merged storage/myisam/mi_panic.c: Auto merged storage/myisam/mi_preload.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_rename.c: Auto merged storage/myisam/mi_rfirst.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/mi_rlast.c: Auto merged storage/myisam/mi_rnext.c: Auto merged storage/myisam/mi_rnext_same.c: Auto merged storage/myisam/mi_rprev.c: Auto merged storage/myisam/mi_rrnd.c: Auto merged storage/myisam/mi_rsame.c: Auto merged storage/myisam/mi_rsamepos.c: Auto merged storage/myisam/mi_scan.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_static.c: Auto merged storage/myisam/mi_statrec.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_test3.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisam_ftdump.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/rt_index.c: Auto merged storage/myisam/rt_index.h: Auto merged storage/myisam/rt_key.h: Auto merged storage/myisam/rt_mbr.c: Auto merged storage/myisam/rt_mbr.h: Auto merged storage/myisam/rt_split.c: Auto merged storage/myisam/rt_test.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_defs.h: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/Makefile.am: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/myisammrg/myrg_close.c: Auto merged storage/myisammrg/myrg_create.c: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_delete.c: Auto merged storage/myisammrg/myrg_extra.c: Auto merged storage/myisammrg/myrg_info.c: Auto merged storage/myisammrg/myrg_locking.c: Auto merged storage/myisammrg/myrg_open.c: Auto merged storage/myisammrg/myrg_panic.c: Auto merged storage/myisammrg/myrg_queue.c: Auto merged storage/myisammrg/myrg_range.c: Auto merged storage/myisammrg/myrg_rfirst.c: Auto merged storage/myisammrg/myrg_rkey.c: Auto merged storage/myisammrg/myrg_rlast.c: Auto merged storage/myisammrg/myrg_rnext.c: Auto merged storage/myisammrg/myrg_rnext_same.c: Auto merged storage/myisammrg/myrg_rprev.c: Auto merged storage/myisammrg/myrg_rrnd.c: Auto merged storage/myisammrg/myrg_rsame.c: Auto merged storage/myisammrg/myrg_static.c: Auto merged storage/myisammrg/myrg_update.c: Auto merged storage/myisammrg/myrg_write.c: Auto merged storage/ndb/Makefile.am: Auto merged storage/ndb/config/common.mk.am: Auto merged storage/ndb/config/type_kernel.mk.am: Auto merged storage/ndb/config/type_mgmapiclient.mk.am: Auto merged storage/ndb/config/type_ndbapi.mk.am: Auto merged storage/ndb/config/type_ndbapiclient.mk.am: Auto merged storage/ndb/config/type_ndbapitest.mk.am: Auto merged storage/ndb/config/type_ndbapitools.mk.am: Auto merged storage/ndb/config/type_util.mk.am: Auto merged storage/ndb/docs/Makefile.am: Auto merged storage/ndb/include/Makefile.am: Auto merged storage/ndb/include/kernel/kernel_config_parameters.h: Auto merged storage/ndb/include/kernel/signaldata/CntrStart.hpp: Auto merged storage/ndb/include/kernel/signaldata/ReadConfig.hpp: Auto merged storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp: Auto merged storage/ndb/include/logger/FileLogHandler.hpp: Auto merged storage/ndb/include/ndb_net.h: Auto merged storage/ndb/include/mgmapi/mgmapi_config_parameters.h: Auto merged storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h: Auto merged storage/ndb/include/util/ConfigValues.hpp: Auto merged storage/ndb/include/util/File.hpp: Auto merged storage/ndb/include/util/Vector.hpp: Auto merged storage/ndb/src/Makefile.am: Auto merged storage/ndb/src/common/Makefile.am: Auto merged storage/ndb/src/common/debugger/Makefile.am: Auto merged storage/ndb/src/common/debugger/signaldata/CntrStart.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/Makefile.am: Auto merged storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/print.awk: Auto merged storage/ndb/src/common/logger/FileLogHandler.cpp: Auto merged storage/ndb/src/common/logger/Makefile.am: Auto merged storage/ndb/src/common/mgmcommon/Makefile.am: Auto merged storage/ndb/src/common/transporter/Makefile.am: Auto merged storage/ndb/src/common/util/Bitmask.cpp: Auto merged storage/ndb/src/common/util/ConfigValues.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged storage/ndb/src/common/util/Makefile.am: Auto merged storage/ndb/src/common/util/new.cpp: Auto merged storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp: Auto merged storage/ndb/src/cw/Makefile.am: Auto merged storage/ndb/src/cw/cpcd/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/backup/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl: Auto merged storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/error/Makefile.am: Auto merged storage/ndb/src/kernel/vm/Makefile.am: Auto merged storage/ndb/src/mgmapi/Makefile.am: Auto merged storage/ndb/src/mgmapi/mgmapi_configuration.cpp: Auto merged storage/ndb/src/mgmclient/Makefile.am: Auto merged storage/ndb/src/mgmsrv/Makefile.am: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/ndbapi/Makefile.am: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/test/Makefile.am: Auto merged storage/ndb/test/ndbapi/Makefile.am: Auto merged storage/ndb/test/ndbapi/bank/Makefile.am: Auto merged storage/ndb/test/ndbapi/testBasic.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/test/run-test/Makefile.am: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/src/Makefile.am: Auto merged storage/ndb/test/tools/Makefile.am: Auto merged storage/ndb/tools/Makefile.am: Auto merged strings/Makefile.am: Auto merged strings/ctype-extra.c: Auto merged tests/Makefile.am: Auto merged vio/Makefile.am: Auto merged BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e: Auto merged BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e: Auto merged BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a: Auto merged BitKeeper/deleted/.del-docbook-split~be931c3922898d0: Auto merged BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9: Auto merged BitKeeper/deleted/.del-make-makefile~39fd454b487126e8: Auto merged BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a: Auto merged BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec: Auto merged BitKeeper/deleted/.del-xwf~76b97805d9146b80: Auto merged server-tools/instance-manager/listener.h: SCCS merged server-tools/instance-manager/manager.h: SCCS merged server-tools/instance-manager/mysql_connection.h: SCCS merged server-tools/instance-manager/priv.h: SCCS merged storage/ndb/src/kernel/blocks/dblqh/Makefile.am: SCCS merged
523 lines
16 KiB
C
523 lines
16 KiB
C
/* Copyright (C) 2000-2006 MySQL 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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
/* password checking routines */
|
|
/*****************************************************************************
|
|
The main idea is that no password are sent between client & server on
|
|
connection and that no password are saved in mysql in a decodable form.
|
|
|
|
On connection a random string is generated and sent to the client.
|
|
The client generates a new string with a random generator inited with
|
|
the hash values from the password and the sent string.
|
|
This 'check' string is sent to the server where it is compared with
|
|
a string generated from the stored hash_value of the password and the
|
|
random string.
|
|
|
|
The password is saved (in user.password) by using the PASSWORD() function in
|
|
mysql.
|
|
|
|
This is .c file because it's used in libmysqlclient, which is entirely in C.
|
|
(we need it to be portable to a variety of systems).
|
|
Example:
|
|
update user set password=PASSWORD("hello") where user="test"
|
|
This saves a hashed number as a string in the password field.
|
|
|
|
The new authentication is performed in following manner:
|
|
|
|
SERVER: public_seed=create_random_string()
|
|
send(public_seed)
|
|
|
|
CLIENT: recv(public_seed)
|
|
hash_stage1=sha1("password")
|
|
hash_stage2=sha1(hash_stage1)
|
|
reply=xor(hash_stage1, sha1(public_seed,hash_stage2)
|
|
|
|
// this three steps are done in scramble()
|
|
|
|
send(reply)
|
|
|
|
|
|
SERVER: recv(reply)
|
|
hash_stage1=xor(reply, sha1(public_seed,hash_stage2))
|
|
candidate_hash2=sha1(hash_stage1)
|
|
check(candidate_hash2==hash_stage2)
|
|
|
|
// this three steps are done in check_scramble()
|
|
|
|
*****************************************************************************/
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <sha1.h>
|
|
#include "mysql.h"
|
|
|
|
/************ MySQL 3.23-4.0 authentication routines: untouched ***********/
|
|
|
|
/*
|
|
New (MySQL 3.21+) random generation structure initialization
|
|
SYNOPSIS
|
|
randominit()
|
|
rand_st OUT Structure to initialize
|
|
seed1 IN First initialization parameter
|
|
seed2 IN Second initialization parameter
|
|
*/
|
|
|
|
void randominit(struct rand_struct *rand_st, ulong seed1, ulong seed2)
|
|
{ /* For mysql 3.21.# */
|
|
#ifdef HAVE_purify
|
|
bzero((char*) rand_st,sizeof(*rand_st)); /* Avoid UMC varnings */
|
|
#endif
|
|
rand_st->max_value= 0x3FFFFFFFL;
|
|
rand_st->max_value_dbl=(double) rand_st->max_value;
|
|
rand_st->seed1=seed1%rand_st->max_value ;
|
|
rand_st->seed2=seed2%rand_st->max_value;
|
|
}
|
|
|
|
|
|
/*
|
|
Generate random number.
|
|
SYNOPSIS
|
|
my_rnd()
|
|
rand_st INOUT Structure used for number generation
|
|
RETURN VALUE
|
|
generated pseudo random number
|
|
*/
|
|
|
|
double my_rnd(struct rand_struct *rand_st)
|
|
{
|
|
rand_st->seed1=(rand_st->seed1*3+rand_st->seed2) % rand_st->max_value;
|
|
rand_st->seed2=(rand_st->seed1+rand_st->seed2+33) % rand_st->max_value;
|
|
return (((double) rand_st->seed1)/rand_st->max_value_dbl);
|
|
}
|
|
|
|
|
|
/*
|
|
Generate binary hash from raw text string
|
|
Used for Pre-4.1 password handling
|
|
SYNOPSIS
|
|
hash_password()
|
|
result OUT store hash in this location
|
|
password IN plain text password to build hash
|
|
password_len IN password length (password may be not null-terminated)
|
|
*/
|
|
|
|
void hash_password(ulong *result, const char *password, uint password_len)
|
|
{
|
|
register ulong nr=1345345333L, add=7, nr2=0x12345671L;
|
|
ulong tmp;
|
|
const char *password_end= password + password_len;
|
|
for (; password < password_end; password++)
|
|
{
|
|
if (*password == ' ' || *password == '\t')
|
|
continue; /* skip space in password */
|
|
tmp= (ulong) (uchar) *password;
|
|
nr^= (((nr & 63)+add)*tmp)+ (nr << 8);
|
|
nr2+=(nr2 << 8) ^ nr;
|
|
add+=tmp;
|
|
}
|
|
result[0]=nr & (((ulong) 1L << 31) -1L); /* Don't use sign bit (str2int) */;
|
|
result[1]=nr2 & (((ulong) 1L << 31) -1L);
|
|
}
|
|
|
|
|
|
/*
|
|
Create password to be stored in user database from raw string
|
|
Used for pre-4.1 password handling
|
|
SYNOPSIS
|
|
make_scrambled_password_323()
|
|
to OUT store scrambled password here
|
|
password IN user-supplied password
|
|
*/
|
|
|
|
void make_scrambled_password_323(char *to, const char *password)
|
|
{
|
|
ulong hash_res[2];
|
|
hash_password(hash_res, password, (uint) strlen(password));
|
|
sprintf(to, "%08lx%08lx", hash_res[0], hash_res[1]);
|
|
}
|
|
|
|
|
|
/*
|
|
Scramble string with password.
|
|
Used in pre 4.1 authentication phase.
|
|
SYNOPSIS
|
|
scramble_323()
|
|
to OUT Store scrambled message here. Buffer must be at least
|
|
SCRAMBLE_LENGTH_323+1 bytes long
|
|
message IN Message to scramble. Message must be at least
|
|
SRAMBLE_LENGTH_323 bytes long.
|
|
password IN Password to use while scrambling
|
|
*/
|
|
|
|
void scramble_323(char *to, const char *message, const char *password)
|
|
{
|
|
struct rand_struct rand_st;
|
|
ulong hash_pass[2], hash_message[2];
|
|
|
|
if (password && password[0])
|
|
{
|
|
char extra, *to_start=to;
|
|
const char *message_end= message + SCRAMBLE_LENGTH_323;
|
|
hash_password(hash_pass,password, (uint) strlen(password));
|
|
hash_password(hash_message, message, SCRAMBLE_LENGTH_323);
|
|
randominit(&rand_st,hash_pass[0] ^ hash_message[0],
|
|
hash_pass[1] ^ hash_message[1]);
|
|
for (; message < message_end; message++)
|
|
*to++= (char) (floor(my_rnd(&rand_st)*31)+64);
|
|
extra=(char) (floor(my_rnd(&rand_st)*31));
|
|
while (to_start != to)
|
|
*(to_start++)^=extra;
|
|
}
|
|
*to= 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Check scrambled message
|
|
Used in pre 4.1 password handling
|
|
SYNOPSIS
|
|
check_scramble_323()
|
|
scrambled scrambled message to check.
|
|
message original random message which was used for scrambling; must
|
|
be exactly SCRAMBLED_LENGTH_323 bytes long and
|
|
NULL-terminated.
|
|
hash_pass password which should be used for scrambling
|
|
All params are IN.
|
|
|
|
RETURN VALUE
|
|
0 - password correct
|
|
!0 - password invalid
|
|
*/
|
|
|
|
my_bool
|
|
check_scramble_323(const char *scrambled, const char *message,
|
|
ulong *hash_pass)
|
|
{
|
|
struct rand_struct rand_st;
|
|
ulong hash_message[2];
|
|
char buff[16],*to,extra; /* Big enough for check */
|
|
const char *pos;
|
|
|
|
hash_password(hash_message, message, SCRAMBLE_LENGTH_323);
|
|
randominit(&rand_st,hash_pass[0] ^ hash_message[0],
|
|
hash_pass[1] ^ hash_message[1]);
|
|
to=buff;
|
|
DBUG_ASSERT(sizeof(buff) > SCRAMBLE_LENGTH_323);
|
|
for (pos=scrambled ; *pos && to < buff+sizeof(buff) ; pos++)
|
|
*to++=(char) (floor(my_rnd(&rand_st)*31)+64);
|
|
if (pos-scrambled != SCRAMBLE_LENGTH_323)
|
|
return 1;
|
|
extra=(char) (floor(my_rnd(&rand_st)*31));
|
|
to=buff;
|
|
while (*scrambled)
|
|
{
|
|
if (*scrambled++ != (char) (*to++ ^ extra))
|
|
return 1; /* Wrong password */
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static inline uint8 char_val(uint8 X)
|
|
{
|
|
return (uint) (X >= '0' && X <= '9' ? X-'0' :
|
|
X >= 'A' && X <= 'Z' ? X-'A'+10 : X-'a'+10);
|
|
}
|
|
|
|
|
|
/*
|
|
Convert password from hex string (as stored in mysql.user) to binary form.
|
|
SYNOPSIS
|
|
get_salt_from_password_323()
|
|
res OUT store salt here
|
|
password IN password string as stored in mysql.user
|
|
NOTE
|
|
This function does not have length check for passwords. It will just crash
|
|
Password hashes in old format must have length divisible by 8
|
|
*/
|
|
|
|
void get_salt_from_password_323(ulong *res, const char *password)
|
|
{
|
|
res[0]= res[1]= 0;
|
|
if (password)
|
|
{
|
|
while (*password)
|
|
{
|
|
ulong val=0;
|
|
uint i;
|
|
for (i=0 ; i < 8 ; i++)
|
|
val=(val << 4)+char_val(*password++);
|
|
*res++=val;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Convert scrambled password from binary form to asciiz hex string.
|
|
SYNOPSIS
|
|
make_password_from_salt_323()
|
|
to OUT store resulting string password here, at least 17 bytes
|
|
salt IN password in salt format, 2 ulongs
|
|
*/
|
|
|
|
void make_password_from_salt_323(char *to, const ulong *salt)
|
|
{
|
|
sprintf(to,"%08lx%08lx", salt[0], salt[1]);
|
|
}
|
|
|
|
|
|
/*
|
|
**************** MySQL 4.1.1 authentication routines *************
|
|
*/
|
|
|
|
/*
|
|
Generate string of printable random characters of requested length
|
|
SYNOPSIS
|
|
create_random_string()
|
|
to OUT buffer for generation; must be at least length+1 bytes
|
|
long; result string is always null-terminated
|
|
length IN how many random characters to put in buffer
|
|
rand_st INOUT structure used for number generation
|
|
*/
|
|
|
|
void create_random_string(char *to, uint length, struct rand_struct *rand_st)
|
|
{
|
|
char *end= to + length;
|
|
/* Use pointer arithmetics as it is faster way to do so. */
|
|
for (; to < end; to++)
|
|
*to= (char) (my_rnd(rand_st)*94+33);
|
|
*to= '\0';
|
|
}
|
|
|
|
|
|
/* Character to use as version identifier for version 4.1 */
|
|
|
|
#define PVERSION41_CHAR '*'
|
|
|
|
|
|
/*
|
|
Convert given octet sequence to asciiz string of hex characters;
|
|
str..str+len and 'to' may not overlap.
|
|
SYNOPSIS
|
|
octet2hex()
|
|
buf OUT output buffer. Must be at least 2*len+1 bytes
|
|
str, len IN the beginning and the length of the input string
|
|
|
|
RETURN
|
|
buf+len*2
|
|
*/
|
|
|
|
char *octet2hex(char *to, const char *str, uint len)
|
|
{
|
|
const char *str_end= str + len;
|
|
for (; str != str_end; ++str)
|
|
{
|
|
*to++= _dig_vec_upper[((uchar) *str) >> 4];
|
|
*to++= _dig_vec_upper[((uchar) *str) & 0x0F];
|
|
}
|
|
*to= '\0';
|
|
return to;
|
|
}
|
|
|
|
|
|
/*
|
|
Convert given asciiz string of hex (0..9 a..f) characters to octet
|
|
sequence.
|
|
SYNOPSIS
|
|
hex2octet()
|
|
to OUT buffer to place result; must be at least len/2 bytes
|
|
str, len IN begin, length for character string; str and to may not
|
|
overlap; len % 2 == 0
|
|
*/
|
|
|
|
static void
|
|
hex2octet(uint8 *to, const char *str, uint len)
|
|
{
|
|
const char *str_end= str + len;
|
|
while (str < str_end)
|
|
{
|
|
register char tmp= char_val(*str++);
|
|
*to++= (tmp << 4) | char_val(*str++);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Encrypt/Decrypt function used for password encryption in authentication.
|
|
Simple XOR is used here but it is OK as we crypt random strings. Note,
|
|
that XOR(s1, XOR(s1, s2)) == s2, XOR(s1, s2) == XOR(s2, s1)
|
|
SYNOPSIS
|
|
my_crypt()
|
|
to OUT buffer to hold crypted string; must be at least len bytes
|
|
long; to and s1 (or s2) may be the same.
|
|
s1, s2 IN input strings (of equal length)
|
|
len IN length of s1 and s2
|
|
*/
|
|
|
|
static void
|
|
my_crypt(char *to, const uchar *s1, const uchar *s2, uint len)
|
|
{
|
|
const uint8 *s1_end= s1 + len;
|
|
while (s1 < s1_end)
|
|
*to++= *s1++ ^ *s2++;
|
|
}
|
|
|
|
|
|
/*
|
|
MySQL 4.1.1 password hashing: SHA conversion (see RFC 2289, 3174) twice
|
|
applied to the password string, and then produced octet sequence is
|
|
converted to hex string.
|
|
The result of this function is used as return value from PASSWORD() and
|
|
is stored in the database.
|
|
SYNOPSIS
|
|
make_scrambled_password()
|
|
buf OUT buffer of size 2*SHA1_HASH_SIZE + 2 to store hex string
|
|
password IN NULL-terminated password string
|
|
*/
|
|
|
|
void
|
|
make_scrambled_password(char *to, const char *password)
|
|
{
|
|
SHA1_CONTEXT sha1_context;
|
|
uint8 hash_stage2[SHA1_HASH_SIZE];
|
|
|
|
mysql_sha1_reset(&sha1_context);
|
|
/* stage 1: hash password */
|
|
mysql_sha1_input(&sha1_context, (uint8 *) password, (uint) strlen(password));
|
|
mysql_sha1_result(&sha1_context, (uint8 *) to);
|
|
/* stage 2: hash stage1 output */
|
|
mysql_sha1_reset(&sha1_context);
|
|
mysql_sha1_input(&sha1_context, (uint8 *) to, SHA1_HASH_SIZE);
|
|
/* separate buffer is used to pass 'to' in octet2hex */
|
|
mysql_sha1_result(&sha1_context, hash_stage2);
|
|
/* convert hash_stage2 to hex string */
|
|
*to++= PVERSION41_CHAR;
|
|
octet2hex(to, (const char*) hash_stage2, SHA1_HASH_SIZE);
|
|
}
|
|
|
|
|
|
/*
|
|
Produce an obscure octet sequence from password and random
|
|
string, recieved from the server. This sequence corresponds to the
|
|
password, but password can not be easily restored from it. The sequence
|
|
is then sent to the server for validation. Trailing zero is not stored
|
|
in the buf as it is not needed.
|
|
This function is used by client to create authenticated reply to the
|
|
server's greeting.
|
|
SYNOPSIS
|
|
scramble()
|
|
buf OUT store scrambled string here. The buf must be at least
|
|
SHA1_HASH_SIZE bytes long.
|
|
message IN random message, must be exactly SCRAMBLE_LENGTH long and
|
|
NULL-terminated.
|
|
password IN users' password
|
|
*/
|
|
|
|
void
|
|
scramble(char *to, const char *message, const char *password)
|
|
{
|
|
SHA1_CONTEXT sha1_context;
|
|
uint8 hash_stage1[SHA1_HASH_SIZE];
|
|
uint8 hash_stage2[SHA1_HASH_SIZE];
|
|
|
|
mysql_sha1_reset(&sha1_context);
|
|
/* stage 1: hash password */
|
|
mysql_sha1_input(&sha1_context, (uint8 *) password, (uint) strlen(password));
|
|
mysql_sha1_result(&sha1_context, hash_stage1);
|
|
/* stage 2: hash stage 1; note that hash_stage2 is stored in the database */
|
|
mysql_sha1_reset(&sha1_context);
|
|
mysql_sha1_input(&sha1_context, hash_stage1, SHA1_HASH_SIZE);
|
|
mysql_sha1_result(&sha1_context, hash_stage2);
|
|
/* create crypt string as sha1(message, hash_stage2) */;
|
|
mysql_sha1_reset(&sha1_context);
|
|
mysql_sha1_input(&sha1_context, (const uint8 *) message, SCRAMBLE_LENGTH);
|
|
mysql_sha1_input(&sha1_context, hash_stage2, SHA1_HASH_SIZE);
|
|
/* xor allows 'from' and 'to' overlap: lets take advantage of it */
|
|
mysql_sha1_result(&sha1_context, (uint8 *) to);
|
|
my_crypt(to, (const uchar *) to, hash_stage1, SCRAMBLE_LENGTH);
|
|
}
|
|
|
|
|
|
/*
|
|
Check that scrambled message corresponds to the password; the function
|
|
is used by server to check that recieved reply is authentic.
|
|
This function does not check lengths of given strings: message must be
|
|
null-terminated, reply and hash_stage2 must be at least SHA1_HASH_SIZE
|
|
long (if not, something fishy is going on).
|
|
SYNOPSIS
|
|
check_scramble()
|
|
scramble clients' reply, presumably produced by scramble()
|
|
message original random string, previously sent to client
|
|
(presumably second argument of scramble()), must be
|
|
exactly SCRAMBLE_LENGTH long and NULL-terminated.
|
|
hash_stage2 hex2octet-decoded database entry
|
|
All params are IN.
|
|
|
|
RETURN VALUE
|
|
0 password is correct
|
|
!0 password is invalid
|
|
*/
|
|
|
|
my_bool
|
|
check_scramble(const char *scramble, const char *message,
|
|
const uint8 *hash_stage2)
|
|
{
|
|
SHA1_CONTEXT sha1_context;
|
|
uint8 buf[SHA1_HASH_SIZE];
|
|
uint8 hash_stage2_reassured[SHA1_HASH_SIZE];
|
|
|
|
mysql_sha1_reset(&sha1_context);
|
|
/* create key to encrypt scramble */
|
|
mysql_sha1_input(&sha1_context, (const uint8 *) message, SCRAMBLE_LENGTH);
|
|
mysql_sha1_input(&sha1_context, hash_stage2, SHA1_HASH_SIZE);
|
|
mysql_sha1_result(&sha1_context, buf);
|
|
/* encrypt scramble */
|
|
my_crypt((char *) buf, buf, (const uchar *) scramble, SCRAMBLE_LENGTH);
|
|
/* now buf supposedly contains hash_stage1: so we can get hash_stage2 */
|
|
mysql_sha1_reset(&sha1_context);
|
|
mysql_sha1_input(&sha1_context, buf, SHA1_HASH_SIZE);
|
|
mysql_sha1_result(&sha1_context, hash_stage2_reassured);
|
|
return memcmp(hash_stage2, hash_stage2_reassured, SHA1_HASH_SIZE);
|
|
}
|
|
|
|
|
|
/*
|
|
Convert scrambled password from asciiz hex string to binary form.
|
|
SYNOPSIS
|
|
get_salt_from_password()
|
|
res OUT buf to hold password. Must be at least SHA1_HASH_SIZE
|
|
bytes long.
|
|
password IN 4.1.1 version value of user.password
|
|
*/
|
|
|
|
void get_salt_from_password(uint8 *hash_stage2, const char *password)
|
|
{
|
|
hex2octet(hash_stage2, password+1 /* skip '*' */, SHA1_HASH_SIZE * 2);
|
|
}
|
|
|
|
/*
|
|
Convert scrambled password from binary form to asciiz hex string.
|
|
SYNOPSIS
|
|
make_password_from_salt()
|
|
to OUT store resulting string here, 2*SHA1_HASH_SIZE+2 bytes
|
|
salt IN password in salt format
|
|
*/
|
|
|
|
void make_password_from_salt(char *to, const uint8 *hash_stage2)
|
|
{
|
|
*to++= PVERSION41_CHAR;
|
|
octet2hex(to, (const char*) hash_stage2, SHA1_HASH_SIZE);
|
|
}
|