Low: Core: Obtain md5sum functionality from gnulib

Author: beekhof

.gitignore

@@ -122,7 +122,8 @@ doc/Clusters_from_Scratch/en-US/Ch-Tools.xml
 doc/Clusters_from_Scratch/en-US/Ch-Verification.xml
 doc/Pacemaker_Explained/en-US/Ch-Basics.xml
 doc/Pacemaker_Explained/en-US/Ch-Options.xml
-
+lib/gnu/libgnu.a
+lib/gnu/stdalign.h
 
 #Other 
 mock

GNUmakefile

@@ -223,3 +223,13 @@ clang:
 	test -e $(ccc_analyzer) || echo "CLang Analyiser not available. Install the clang-analyzer package"
 	test -e $(ccc_analyzer) || false
 	make CC=$(ccc_analyzer) check
+
+# Not available: strlcat
+# V3	= scandir unsetenv alphasort 
+# V2	= setenv strerror strchrnul strndup
+# http://www.gnu.org/software/gnulib/manual/html_node/Initial-import.html#Initial-import
+GNU_MODS	= crypto/md5
+gnulib-update:
+	-test ! -e gnulib && git clone git://git.savannah.gnu.org/gnulib.git
+	cd gnulib && git pull
+	gnulib/gnulib-tool --source-base=lib/gnu --lgpl=2 --no-vc-files --import $(GNU_MODS)

Makefile.am

@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-EXTRA_DIST              = autogen.sh ConfigureMe README.in libltdl.tar
+EXTRA_DIST              = autogen.sh ConfigureMe README.in libltdl.tar m4/gnulib-cache.m4
 
 MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure DRF/config-h.in \
                         DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
@@ -28,8 +28,8 @@ SUBDIRS	= $(CORE) cts extra doc
 
 doc_DATA = AUTHORS COPYING COPYING.LIB
 
-AUTOMAKE_OPTIONS	= foreign
-##ACLOCAL                 = aclocal -I $(auxdir)
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS  = -I m4
 
 core:
 	@echo "Building only core components: $(CORE)"

configure.ac

@@ -6,7 +6,7 @@ dnl License: GNU General Public License (GPL)
 dnl ===============================================
 dnl Bootstrap 
 dnl ===============================================
-AC_PREREQ(2.53)
+AC_PREREQ(2.59)
 
 dnl Suggested structure:
 dnl     information on the package
@@ -82,6 +82,8 @@ dnl ========================================================================
 AC_PROG_CC dnl Can force other with environment variable "CC".
 AM_PROG_CC_C_O
 AC_PROG_CC_STDC
+gl_EARLY
+gl_INIT
 
 AC_LIBTOOL_DLOPEN               dnl Enable dlopen support...
 AC_LIBLTDL_CONVENIENCE          dnl make libltdl a convenience lib
@@ -1690,6 +1692,7 @@ tools/Makefile							\
 	tools/hb2openais.sh					\
 	tools/crm_primitive.py					\
 xml/Makefile							\
+lib/gnu/Makefile						\
 		)
 
 dnl Now process the entire list of files added by previous 

include/crm/common/util.h

@@ -371,4 +371,6 @@ extern void *convert_const_pointer(const void *ptr);
 
 extern char *crm_generate_uuid(void);
 
+char *crm_md5sum(const char *buffer);
+
 #endif

lib/Makefile.am

@@ -39,7 +39,7 @@ clean-local:
 	rm -f *.pc
 
 ## Subdirectories...
-SUBDIRS	= common pengine transition cib fencing cluster plugins
+SUBDIRS	= gnu common pengine transition cib fencing cluster plugins
 DIST_SUBDIRS =  $(SUBDIRS) ais
 
 if BUILD_CS_PLUGIN

lib/common/Makefile.am

@@ -18,7 +18,8 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES       	= -I$(top_builddir)/include  -I$(top_srcdir)/include   \
-		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl
+		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl   \
+		  -I$(top_builddir)/lib/gnu  -I$(top_srcdir)/lib/gnu
 
 ## libraries
 lib_LTLIBRARIES	= libcrmcommon.la
@@ -35,6 +36,7 @@ libcrmcommon_la_SOURCES	= ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.
 
 libcrmcommon_la_LDFLAGS	= -version-info 2:0:0
 libcrmcommon_la_LIBADD  = -ldl $(GNUTLSLIBS)
+libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
 
 if BUILD_HEARTBEAT_SUPPORT
 libcrmcommon_la_SOURCES += heartbeat.c

lib/common/utils.c

@@ -2787,3 +2787,22 @@ char *crm_generate_uuid(void)
 	uuid_unparse(uuid, buffer);
         return buffer;
 }
+
+#include <md5.h>
+
+char *
+crm_md5sum(const char *buffer)
+{
+    int lpc = 0;
+    char *digest = NULL;
+    unsigned char raw_digest[MD5_DIGEST_SIZE];
+
+    digest = malloc(2*MD5_DIGEST_SIZE + 1);
+    md5_buffer(buffer, strlen(buffer), raw_digest);
+    for(lpc = 0; lpc < MD5_DIGEST_SIZE; lpc++) {
+	sprintf(digest+(2*lpc), "%02x", raw_digest[lpc]);
+    }
+    digest[(2*MD5_DIGEST_SIZE)] = 0;
+    crm_trace("Digest %s\n", digest);
+    return digest;
+}

lib/common/xml.c

@@ -34,7 +34,6 @@
 #include <crm/common/xml.h>
 #include <libxml/xmlreader.h>
 
-#include <clplumbing/md5.h>
 #if HAVE_BZLIB_H
 #  include <bzlib.h>
 #endif
@@ -1926,13 +1925,9 @@ filter_xml(xmlNode *data, filter_t *filter, int filter_len, gboolean recursive)
 static char *
 calculate_xml_digest_v1(xmlNode *input, gboolean sort, gboolean do_filter)
 {
-    int i = 0;
-    int digest_len = 16;
     char *digest = NULL;
-    unsigned char *raw_digest = NULL;
     xmlNode *copy = NULL;
     char *buffer = NULL;
-    size_t buffer_len = 0;
 
     if(sort || do_filter) {
 	copy = sorted_xml(input, NULL, TRUE);
@@ -1944,34 +1939,24 @@ calculate_xml_digest_v1(xmlNode *input, gboolean sort, gboolean do_filter)
     }
 
     buffer = dump_xml(input, FALSE, TRUE);
-    buffer_len = strlen(buffer);
-	
-    CRM_CHECK(buffer != NULL && buffer_len > 0, free_xml(copy); crm_free(buffer); return NULL);
+    CRM_CHECK(buffer != NULL && strlen(buffer) > 0, free_xml(copy); crm_free(buffer); return NULL);
 
-    crm_malloc(digest, (2 * digest_len + 1));
-    crm_malloc(raw_digest, (digest_len + 1));
-    MD5((unsigned char *)buffer, buffer_len, raw_digest);
-    for(i = 0; i < digest_len; i++) {
-	sprintf(digest+(2*i), "%02x", raw_digest[i]);
-    }
-    digest[(2*digest_len)] = 0;
+    digest = crm_md5sum(buffer);
     crm_trace("Digest %s: %s\n", digest, buffer);
     crm_log_xml_trace(copy,  "digest:source");
+
     crm_free(buffer);
-    crm_free(raw_digest);
     free_xml(copy);
     return digest;
 }
 
 static char *
 calculate_xml_digest_v2(xmlNode *input, gboolean do_filter)
 {
-    int i = 0;
-    int digest_len = 16;
     char *digest = NULL;
-    size_t buffer_len = 0;
+
+    int buffer_len = 0;
     int filter_size = DIMOF(filter);
-    unsigned char *raw_digest = NULL;
 
     xmlDoc *doc = NULL;
     xmlNode *copy = NULL;
@@ -2019,16 +2004,9 @@ calculate_xml_digest_v2(xmlNode *input, gboolean do_filter)
     CRM_CHECK(doc != NULL, return NULL); /* doc will only be NULL if an_xml_node is */
 
     buffer_len = xmlNodeDump(xml_buffer, doc, input, 0, FALSE);
-    
     CRM_CHECK(xml_buffer->content != NULL && buffer_len > 0, goto done);
 
-    crm_malloc(digest, (2 * digest_len + 1));
-    crm_malloc(raw_digest, (digest_len + 1));
-    MD5((unsigned char *)xml_buffer->content, buffer_len, raw_digest);
-    for(i = 0; i < digest_len; i++) {
-	sprintf(digest+(2*i), "%02x", raw_digest[i]);
-    }
-    digest[(2*digest_len)] = 0;
+    digest = crm_md5sum((char *)xml_buffer->content);
     crm_trace("Digest %s\n", digest);
 
         if(digest_cs == NULL) {
@@ -2054,7 +2032,6 @@ calculate_xml_digest_v2(xmlNode *input, gboolean do_filter)
 
   done:
     xmlBufferFree(xml_buffer);
-    crm_free(raw_digest);
     free_xml(copy);
 
     return digest;

lib/gnu/Makefile.am

@@ -0,0 +1,139 @@
+## DO NOT EDIT! GENERATED AUTOMATICALLY!
+## Process this file with automake to produce Makefile.in.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This file 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 3 of the License, or
+# (at your option) any later version.
+#
+# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib/gnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --lgpl=2 --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files crypto/md5
+
+AUTOMAKE_OPTIONS = 1.5 gnits
+
+SUBDIRS =
+noinst_HEADERS =
+noinst_LIBRARIES =
+noinst_LTLIBRARIES =
+EXTRA_DIST =
+BUILT_SOURCES =
+SUFFIXES =
+MOSTLYCLEANFILES = core *.stackdump
+MOSTLYCLEANDIRS =
+CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+
+AM_CPPFLAGS =
+AM_CFLAGS =
+
+noinst_LIBRARIES += libgnu.a
+
+libgnu_a_SOURCES =
+libgnu_a_LIBADD = $(gl_LIBOBJS)
+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
+EXTRA_libgnu_a_SOURCES =
+
+## begin gnulib module crypto/md5
+
+libgnu_a_SOURCES += md5.c
+
+EXTRA_DIST += md5.h
+
+## end   gnulib module crypto/md5
+
+## begin gnulib module stdalign
+
+BUILT_SOURCES += $(STDALIGN_H)
+
+# We need the following in order to create <stdalign.h> when the system
+# doesn't have one that works.
+if GL_GENERATE_STDALIGN_H
+stdalign.h: stdalign.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/stdalign.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+else
+stdalign.h: $(top_builddir)/config.status
+	rm -f $@
+endif
+MOSTLYCLEANFILES += stdalign.h stdalign.h-t
+
+EXTRA_DIST += stdalign.in.h
+
+## end   gnulib module stdalign
+
+## begin gnulib module stdint
+
+BUILT_SOURCES += $(STDINT_H)
+
+# We need the following in order to create <stdint.h> when the system
+# doesn't have one that works with the given compiler.
+if GL_GENERATE_STDINT_H
+stdint.h: stdint.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
+	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
+	      < $(srcdir)/stdint.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+else
+stdint.h: $(top_builddir)/config.status
+	rm -f $@
+endif
+MOSTLYCLEANFILES += stdint.h stdint.h-t
+
+EXTRA_DIST += stdint.in.h
+
+## end   gnulib module stdint
+
+
+mostlyclean-local: mostlyclean-generic
+	@for dir in '' $(MOSTLYCLEANDIRS); do \
+	  if test -n "$$dir" && test -d $$dir; then \
+	    echo "rmdir $$dir"; rmdir $$dir; \
+	  fi; \
+	done; \
+	: