[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / gen-md5.h

diff --git a/src/gen-md5.h b/src/gen-md5.h
index cbac40856db492b66297a541c090e96d5500ad8b..f833d3a7fe941b38749ebb5d04f7655a1fbb3357 100644 (file)
--- a/src/gen-md5.h
+++ b/src/gen-md5.h
@@ -5,7 +5,7 @@ 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,
@@ -14,8 +14,17 @@ 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
-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/>.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #ifndef GEN_MD5_H
 #define GEN_MD5_H
@@ -26,12 +35,15 @@ typedef struct gen_md5_context gen_md5_context;
    includes.  */
 struct gen_md5_context;
 
-#define ALLOCA_MD5_CONTEXT(var_name) \
-  gen_md5_context *var_name = alloca (gen_md5_context_size ())
+#define MD5_HASHLEN 16
 
-int gen_md5_context_size PARAMS ((void));
-void gen_md5_init PARAMS ((gen_md5_context *));
-void gen_md5_update PARAMS ((const unsigned char *, int, gen_md5_context *));
-void gen_md5_finish PARAMS ((gen_md5_context *, unsigned char *));
+#define ALLOCA_MD5_CONTEXT(var_name)                   \
+  gen_md5_context *var_name =                          \
+  (gen_md5_context *) alloca (gen_md5_context_size ())
+
+int gen_md5_context_size (void);
+void gen_md5_init (gen_md5_context *);
+void gen_md5_update (const unsigned char *, int, gen_md5_context *);
+void gen_md5_finish (gen_md5_context *, unsigned char *);
 
 #endif /* GEN_MD5_H */