kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make mod_auth_mysql working with mysqld 4.1.x. Replace make_scrambled_password()

Browse source 
with hash_password().

PR:	54067
This commit is contained in:
Martin Blapp 2004-01-11 18:52:38 +00:00
parent 4a18c8b0dc
commit 276cbb3617
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=97941
1 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
www/mod_auth_mysql_another/files/patch-mod_auth_mysql.c Normal file
View file

@ -0,0 +1,33 @@
--- mod_auth_mysql.c Sat May 10 16:12:34 2003
+++ mod_auth_mysql.c Sun Jan 11 13:16:47 2004
@@ -97,6 +97,7 @@
* MODULE-DEFINITION-END
*/
+#define MYSQL_CRYPT_LEN 17U
#ifdef APACHE2
#define PCALLOC apr_pcalloc
@@ -617,7 +618,8 @@
conn_rec *c = r->connection;
const char *sent_pw, *real_pw;
int res;
- char *scrambled_sent_pw;
+ unsigned long hash_res[2];
+ char scrambled_sent_pw[MYSQL_CRYPT_LEN];
if ((res = ap_get_basic_auth_pw (r, &sent_pw)))
return res;
@@ -658,8 +660,10 @@
/* if AuthMySQLScrambledPassword is On, compare the scrambled password */
if(sec->mysqlScrambled) {
- scrambled_sent_pw = PCALLOC(r->pool, 33);
- make_scrambled_password(scrambled_sent_pw, sent_pw);
+ /* make_scrambled_password(scrambled_sent_pw, sent_pw); */
+ hash_password(hash_res, sent_pw);
+ snprintf(scrambled_sent_pw, sizeof scrambled_sent_pw, "%08lx%08lx",
+ hash_res[0], hash_res[1]);
if(strcmp(real_pw, scrambled_sent_pw)) {
passwords_match = 0;
}