Move adler32 from epan/ to wsutil/

The same like done for crc*

svn path=/trunk/; revision=53190

4 files changed, 106 insertions, 0 deletions

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index f1ce424472..c107aca54f 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -36,6 +36,7 @@ IF(WIN32)
 ENDIF(WIN32)
 
 set(WSUTIL_FILES
+  adler32.c
   aes.c
   airpdcap_wep.c
   crash_info.c
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index a01ecee98a..2dd37efe05 100644
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -29,6 +29,7 @@
 # generated from YACC or Lex files (as Automake doesn't want them in
 # _SOURCES variables).
 LIBWSUTIL_SRC = 	\
+	adler32.c	\
 	aes.c		\
 	airpdcap_wep.c	\
 	crash_info.c	\
@@ -60,6 +61,7 @@ LIBWSUTIL_SRC = 	\
 
 # Header files that are not generated from other files
 LIBWSUTIL_INCLUDES = 	\
+	adler32.h	\
 	aes.h		\
 	bits_ctz.h	\
 	bits_count_ones.h	\
diff --git a/wsutil/adler32.c b/wsutil/adler32.c
new file mode 100644
index 0000000000..542876dc6f
--- /dev/null
+++ b/wsutil/adler32.c
@@ -0,0 +1,61 @@
+/* adler32.c
+ * Compute the Adler32 checksum (RFC 1950)
+ * 2003 Tomas Kukosa
+ * Based on code from RFC 1950 (Chapter 9. Appendix: Sample code)
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program 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 (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <string.h>
+
+#include <glib.h>
+
+#include <epan/adler32.h>
+
+#define BASE 65521 /* largest prime smaller than 65536 */
+
+/*--- update_adler32 --------------------------------------------------------*/
+guint32 update_adler32(guint32 adler, const guint8 *buf, size_t len)
+{
+  guint32 s1 = adler & 0xffff;
+  guint32 s2 = (adler >> 16) & 0xffff;
+  size_t n;
+
+  for (n = 0; n < len; n++) {
+    s1 = (s1 + buf[n]) % BASE;
+    s2 = (s2 + s1)     % BASE;
+  }
+  return (s2 << 16) + s1;
+}
+
+/*--- adler32 ---------------------------------------------------------------*/
+guint32 adler32_bytes(const guint8 *buf, size_t len)
+{
+  return update_adler32(1, buf, len);
+}
+
+/*--- adler32_str -----------------------------------------------------------*/
+guint32 adler32_str(const char *buf)
+{
+  return update_adler32(1, (const guint8*)buf, strlen(buf));
+}
+
+/*---------------------------------------------------------------------------*/
diff --git a/wsutil/adler32.h b/wsutil/adler32.h
new file mode 100644
index 0000000000..14221eb7f0
--- /dev/null
+++ b/wsutil/adler32.h
@@ -0,0 +1,42 @@
+/* adler32.h
+ * Compute the Adler32 checksum (RFC 1950)
+ * 2003 Tomas Kukosa
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program 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 (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef ADLER32_H
+#define ADLER32_H
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+guint32 update_adler32(guint32 adler, const guint8 *buf, size_t len);
+guint32 adler32_bytes(const guint8 *buf, size_t len);
+guint32 adler32_str(const char *buf);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* ADLER32_H */
+