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

@@ -134,7 +134,6 @@ void get_pass(char* pw, int len)
 int main(int argc, char** argv)
 {
   FILE* fp;
-  my_MD5_CTX context;
   uchar digest[16];
   char pw[17];
   uint i;
@@ -147,9 +146,7 @@ int main(int argc, char** argv)
   if (!(fp=fopen(outfile,"w")))
     die("Could not open '%s'(errno=%d)",outfile,errno);
   get_pass(pw,sizeof(pw)-1);
-  my_MD5Init(&context);
-  my_MD5Update(&context,(uchar*) pw,sizeof(pw)-1);
-  my_MD5Final(digest,&context);
+  MY_MD5_HASH(digest,(uchar*) pw,sizeof(pw)-1);
   fprintf(fp,"%s:",user);
   for (i=0;i<sizeof(digest);i++)
     fprintf(fp,"%02x",digest[i]);

include/my_md5.h

@@ -13,80 +13,42 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/* See md5.c for explanation and copyright information.  */
 
-/* MD5.H - header file for MD5C.C
+/*
+ * $FreeBSD: src/contrib/cvs/lib/md5.h,v 1.2 1999/12/11 15:10:02 peter Exp $
  */
 
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
+/* Unlike previous versions of this code, uint32 need not be exactly
+   32 bits, merely 32 bits or more.  Choosing a data type which is 32
+   bits instead of 64 is not important; speed is considerably more
+   important.  ANSI guarantees that "unsigned long" will be big enough,
+   and always using it seems to have few disadvantages.  */
+typedef uint32 cvs_uint32;
 
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-/* GLOBAL.H - RSAREF types and constants
- */
-
-/* PROTOTYPES should be set to one if and only if the compiler supports
-  function argument prototyping.
-The following makes PROTOTYPES default to 0 if it has not already
-  been defined with C compiler flags.
- */
-
-/* egcs 1.1.2 under linux didn't defined it.... :( */
-
-#ifndef PROTOTYPES
-#define PROTOTYPES 1				/* Assume prototypes */
-#endif
-
-/* POINTER defines a generic pointer type */
-typedef unsigned char *POINTER;
-
-/* UINT2 defines a two byte word */
-typedef uint16 UINT2;				/* Fix for MySQL / Alpha */
-
-/* UINT4 defines a four byte word */
-typedef uint32 UINT4;				/* Fix for MySQL / Alpha */
-
-/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
-If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
-  returns an empty list.
- */
-#if PROTOTYPES
-#define PROTO_LIST(list) list
-#else
-#define PROTO_LIST(list) ()
-#endif
-/* MD5 context. */
 typedef struct {
-  UINT4 state[4];                                   /* state (ABCD) */
-  UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
-  unsigned char buffer[64];                         /* input buffer */
-} my_MD5_CTX;
+  cvs_uint32 buf[4];
+  cvs_uint32 bits[2];
+  unsigned char in[64];
+} my_MD5Context;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-       void my_MD5Init PROTO_LIST ((my_MD5_CTX *));
-       void my_MD5Update PROTO_LIST
-         ((my_MD5_CTX *, unsigned char *, unsigned int));
-       void my_MD5Final PROTO_LIST ((unsigned char [16], my_MD5_CTX *));
+void my_MD5Init (my_MD5Context *context);
+void my_MD5Update (my_MD5Context *context,
+                   unsigned char const *buf, unsigned len);
+void my_MD5Final (unsigned char digest[16],
+                  my_MD5Context *context);
 
 #ifdef __cplusplus
 }
 #endif
+
+#define MY_MD5_HASH(digest,buf,len) \
+do { \
+  my_MD5Context ctx; \
+  my_MD5Init (&ctx); \
+  my_MD5Update (&ctx, buf, len); \
+  my_MD5Final (digest, &ctx); \
+} while (0)

sql/item_strfunc.cc

@@ -101,13 +101,10 @@ String *Item_func_md5::val_str(String *str)
   str->set_charset(&my_charset_bin);
   if (sptr)
   {
-    my_MD5_CTX context;
     unsigned char digest[16];
 
     null_value=0;
-    my_MD5Init (&context);
-    my_MD5Update (&context,(unsigned char *) sptr->ptr(), sptr->length());
-    my_MD5Final (digest, &context);
+    MY_MD5_HASH(digest,(unsigned char *) sptr->ptr(), sptr->length());
     if (str->alloc(32))				// Ensure that memory is free
     {
       null_value=1;

sql/table.cc

@@ -1792,11 +1792,8 @@ void st_table::reset_item_list(List<Item> *item_list) const
 
 void  TABLE_LIST::calc_md5(char *buffer)
 {
-  my_MD5_CTX context;
   uchar digest[16];
-  my_MD5Init(&context);
-  my_MD5Update(&context,(uchar *) query.str, query.length);
-  my_MD5Final(digest, &context);
+  MY_MD5_HASH(digest, (uchar *) query.str, query.length);
   sprintf((char *) buffer,
 	    "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
 	    digest[0], digest[1], digest[2], digest[3],

tools/mysqlmanager.c

@@ -992,7 +992,6 @@ static void manager_exec_print(NET* net,struct manager_exec* e)
 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");