diff options
| author | lenz@mysql.com <> | 2003-03-18 22:14:02 +0100 |
|---|---|---|
| committer | lenz@mysql.com <> | 2003-03-18 22:14:02 +0100 |
| commit | 04071da35ac91d5d1b8a30a84b7da375ef303d83 (patch) | |
| tree | 92beef04c0b6256679ee496d44e0187ab6809cb8 /sql/password.c | |
| parent | f39eb5787f91e2fd517c880ce6cfc3c94997d3f3 (diff) | |
| download | mariadb-git-04071da35ac91d5d1b8a30a84b7da375ef303d83.tar.gz | |
- renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
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)
Diffstat (limited to 'sql/password.c')
| -rw-r--r-- | sql/password.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/password.c b/sql/password.c index 318c8e84db3..575e837ceb8 100644 --- a/sql/password.c +++ b/sql/password.c @@ -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) { |