diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-13 03:36:36 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-13 03:36:36 +0200 |
| commit | 1ad683a4ff84d6dc6e3d1649d656623a8f88069a (patch) | |
| tree | a6e815e1cd4e8eae71ab4ba58d4bb2176a45d561 /sql/des_key_file.cc | |
| parent | eaee0ac0caae0b0c6193ca3b003b4167daf28c3e (diff) | |
| download | mariadb-git-1ad683a4ff84d6dc6e3d1649d656623a8f88069a.tar.gz | |
Fixes for des_crypt functions.
sql/Makefile.am:
Added missing header file
sql/des_key_file.cc:
Fixed compiler errors
sql/item_strfunc.cc:
Fixed compiler errors
sql/lex.h:
Portablity fix
sql/mysql_priv.h:
Fixed wrong type
sql/sql_yacc.yy:
Portablity fix
Diffstat (limited to 'sql/des_key_file.cc')
| -rw-r--r-- | sql/des_key_file.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/des_key_file.cc b/sql/des_key_file.cc index 164c2ab706e..c6ac9ab6059 100644 --- a/sql/des_key_file.cc +++ b/sql/des_key_file.cc @@ -25,7 +25,7 @@ */ struct st_des_keyschedule des_keyschedule[10]; -uint default_des_key; +uint des_default_key; void load_des_key_file(const char *file_name) @@ -43,7 +43,7 @@ load_des_key_file(const char *file_name) goto error; bzero((char*) des_keyschedule,sizeof(struct st_des_keyschedule) * 10); - default_des_key=15; // Impossible key + des_default_key=15; // Impossible key for (;;) { char *start, *end; @@ -72,8 +72,8 @@ load_des_key_file(const char *file_name) 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 (default_des_key == 15) - default_des_key= (uint) offset; // use first as def. + if (des_default_key == 15) + des_default_key= (uint) offset; // use first as def. } } else |