From 028e731ddb8aaa9ca705093e6d5e2d3e3dfab09f Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Mon, 9 Mar 2009 20:57:03 +0200
Subject: Bug #42434: license of mysys MD5 implementation is not GPL-compatible

Took the Xfree implementation (based on the same rewrite as the NDB one)
and added it instead of the current implementation.
Added a macro to make the calls to MD5 more streamlined.

client/mysqlmanager-pwgen.c:
  Bug #42434: changed to call the macro
include/my_md5.h:
  Bug #42434: use the Xfree implementation
mysys/md5.c:
  Bug #42434: use the Xfree implementation
sql/item_strfunc.cc:
  Bug #42434: changed to call the macro
sql/table.cc:
  Bug #42434: changed to call the macro
tools/mysqlmanager.c:
  Bug #42434: changed to call the macro
---
 tools/mysqlmanager.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index faed9addf60..36f2b8eff9d 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -992,7 +992,6 @@ end:
 static int authenticate(struct manager_thd* thd)
 {
   char* buf_end,*buf,*p,*p_end;
-  my_MD5_CTX context;
   uchar digest[MD5_LEN];
   struct manager_user* u;
   char c;
@@ -1018,9 +1017,7 @@ static int authenticate(struct manager_thd* thd)
     return 1;
   for (;my_isspace(cs,*buf) && buf<buf_end;buf++) /* empty */;
 
-  my_MD5Init(&context);
-  my_MD5Update(&context,(uchar*) buf,(uint)(buf_end-buf));
-  my_MD5Final(digest,&context);
+  MY_MD5_HASH (digest, (uchar*) buf,(uint)(buf_end-buf));
   if (memcmp(u->md5_pass,digest,MD5_LEN))
     return 1;
   client_msg(&thd->net,MANAGER_OK,"OK");
-- 
cgit v1.2.1