mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-03 13:45:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

- renamed "rnd" to "my_rnd" as the name was too generic (and is an exported

Browse source 
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)


BitKeeper/deleted/.del-password.c~c036d4f8b3280843:
  Delete: client/password.c
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
  Delete: libmysql/password.c
include/mysql_com.h:
   - replaced "rnd" with "my_rnd"
libmysql/Makefile.am:
   - removed dead piece of code ($qs was not defined)
   - symlink password.c from the sql directory
libmysqld/Makefile.am:
   - use password.c from the sql directory instead
sql/item_func.cc:
   - replaced "rnd" with "my_rnd"
sql/mysqld.cc:
   - replaced "rnd" with "my_rnd"
sql/password.c:
   - replaced "rnd" with "my_rnd"
sql/sql_class.cc:
   - replaced "rnd" with "my_rnd"
sql/sql_crypt.cc:
   - replaced "rnd" with "my_rnd"
This commit is contained in:
unknown 2003-03-18 22:14:02 +01:00
commit f04be0b9c5
10 changed files with 18 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sql/password.c
View file

@ -59,7 +59,7 @@ static void old_randominit(struct rand_struct *rand_st,ulong seed1)
rand_st->seed1=seed1 ; rand_st->seed2=seed1/2;
}
double rnd(struct rand_struct *rand_st)
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;
@ -91,7 +91,7 @@ void make_scrambled_password(char *to,const char *password)
sprintf(to,"%08lx%08lx",hash_res[0],hash_res[1]);
}
inline uint char_val(char X)
static inline unsigned int char_val(char X)
{
return (uint) (X >= '0' && X <= '9' ? X-'0' :
X >= 'A' && X <= 'Z' ? X-'A'+10 :
@ -147,10 +147,10 @@ char *scramble(char *to,const char *message,const char *password,
randominit(&rand_st,hash_pass[0] ^ hash_message[0],
hash_pass[1] ^ hash_message[1]);
while (*message++)
*to++= (char) (floor(rnd(&rand_st)*31)+64);
*to++= (char) (floor(my_rnd(&rand_st)*31)+64);
if (!old_ver)
{ /* Make it harder to break */
char extra=(char) (floor(rnd(&rand_st)*31));
char extra=(char) (floor(my_rnd(&rand_st)*31));
while (to_start != to)
*(to_start++)^=extra;
}
@ -176,11 +176,11 @@ my_bool check_scramble(const char *scrambled, const char *message,
hash_pass[1] ^ hash_message[1]);
to=buff;
for (pos=scrambled ; *pos ; pos++)
*to++=(char) (floor(rnd(&rand_st)*31)+64);
*to++=(char) (floor(my_rnd(&rand_st)*31)+64);
if (old_ver)
extra=0;
else
extra=(char) (floor(rnd(&rand_st)*31));
extra=(char) (floor(my_rnd(&rand_st)*31));
to=buff;
while (*scrambled)
{