Updated config.guess, config.sub, install.sh.

[wget] / src / gen-md5.c

diff --git a/src/gen-md5.c b/src/gen-md5.c
index 02bd479f5f2584272e8bf1ff362d91cd43b2c314..833f3f28278e5a0e7a59dce891f5915d2f26ea0e 100644 (file)
--- a/src/gen-md5.c
+++ b/src/gen-md5.c
@@ -1,11 +1,12 @@
 /* General MD5 support.
 /* General MD5 support.

-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+   2008 Free Software Foundation, Inc.

 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,16 +15,25 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */

 
 

-#include <config.h>

 #include "wget.h"
 
 #include "gen-md5.h"
 
 #ifdef HAVE_BUILTIN_MD5
 #include "wget.h"
 
 #include "gen-md5.h"
 
 #ifdef HAVE_BUILTIN_MD5

-# include <gnu-md5.h>
+# include <md5.h>

 typedef struct md5_ctx gen_md5_context_imp;
 #endif
 
 typedef struct md5_ctx gen_md5_context_imp;
 #endif
 


@@ -81,7 +91,7 @@ gen_md5_update (unsigned const char *buffer, int len, gen_md5_context *ctx)
 #endif
 
 #ifdef HAVE_SOLARIS_MD5
 #endif
 
 #ifdef HAVE_SOLARIS_MD5

-  MD5Update (ctx_imp, buffer, len);
+  MD5Update (ctx_imp, (unsigned char *)buffer, len);

 #endif
 
 #ifdef HAVE_OPENSSL_MD5
 #endif
 
 #ifdef HAVE_OPENSSL_MD5


@@ -106,3 +116,37 @@ gen_md5_finish (gen_md5_context *ctx, unsigned char *result)
   MD5_Final (result, ctx_imp);
 #endif
 }
   MD5_Final (result, ctx_imp);
 #endif
 }

+
+#if 0
+/* A debugging function for checking whether an MD5 library works. */
+
+#include "gen-md5.h"
+
+char *
+debug_test_md5 (char *buf)
+{
+  unsigned char raw[16];
+  static char res[33];
+  unsigned char *p1;
+  char *p2;
+  int cnt;
+  ALLOCA_MD5_CONTEXT (ctx);
+
+  gen_md5_init (ctx);
+  gen_md5_update ((unsigned char *)buf, strlen (buf), ctx);
+  gen_md5_finish (ctx, raw);
+
+  p1 = raw;
+  p2 = res;
+  cnt = 16;
+  while (cnt--)
+    {
+      *p2++ = XNUM_TO_digit (*p1 >> 4);
+      *p2++ = XNUM_TO_digit (*p1 & 0xf);
+      ++p1;
+    }
+  *p2 = '\0';
+
+  return res;
+}
+#endif