Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

9 files changed, 49 insertions, 661 deletions

diff --git a/lib/plugins/CCpp.cpp b/lib/plugins/CCpp.cpp
index 48bbbb5d..642d97e9 100644
--- a/lib/plugins/CCpp.cpp
+++ b/lib/plugins/CCpp.cpp
@@ -19,13 +19,11 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include <set>
-#include <iomanip>
 #include "abrtlib.h"
 #include "CCpp.h"
 #include "abrt_exception.h"
 #include "comm_layer_inner.h"
 #include "Polkit.h"
-#include "backtrace.h"
 
 using namespace std;
 
@@ -76,78 +74,6 @@ static void create_hash(char hash_str[SHA1_RESULT_LEN*2 + 1], const char *pInput
     //log("hash2:%s str:'%s'", hash_str, pInput);
 }
 
-/**
- *
- * @param[out] status See `man 2 wait` for status information.
- * @return Malloc'ed string
- */
-static char* exec_vp(char **args, uid_t uid, int redirect_stderr, unsigned timeout_sec, int *status)
-{
-    /* Nuke everything which may make setlocale() switch to non-POSIX locale:
-     * we need to avoid having gdb output in some obscure language.
-     */
-    static const char *const unsetenv_vec[] = {
-        "LANG",
-        "LC_ALL",
-        "LC_COLLATE",
-        "LC_CTYPE",
-        "LC_MESSAGES",
-        "LC_MONETARY",
-        "LC_NUMERIC",
-        "LC_TIME",
-        NULL
-    };
-
-    int flags = EXECFLG_INPUT_NUL | EXECFLG_OUTPUT | EXECFLG_SETGUID | EXECFLG_SETSID | EXECFLG_QUIET;
-    if (redirect_stderr)
-        flags |= EXECFLG_ERR2OUT;
-    VERB1 flags &= ~EXECFLG_QUIET;
-
-    int pipeout[2];
-    pid_t child = fork_execv_on_steroids(flags, args, pipeout, (char**)unsetenv_vec, /*dir:*/ NULL, uid);
-
-    /* We use this function to run gdb and unstrip. Bugs in gdb or corrupted
-     * coredumps were observed to cause gdb to enter infinite loop.
-     * Therefore we have a (largish) timeout, after which we kill the child.
-     */
-    int t = time(NULL); /* int is enough, no need to use time_t */
-    int endtime = t + timeout_sec;
-
-    struct strbuf *buf_out = strbuf_new();
-
-    while (1)
-    {
-        int timeout = endtime - t;
-        if (timeout < 0)
-        {
-            kill(child, SIGKILL);
-            strbuf_append_strf(buf_out, "\nTimeout exceeded: %u seconds, killing %s\n", timeout_sec, args[0]);
-            break;
-        }
-
-        /* We don't check poll result - checking read result is enough */
-        struct pollfd pfd;
-        pfd.fd = pipeout[0];
-        pfd.events = POLLIN;
-        poll(&pfd, 1, timeout * 1000);
-
-        char buff[1024];
-        int r = read(pipeout[0], buff, sizeof(buff) - 1);
-        if (r <= 0)
-            break;
-        buff[r] = '\0';
-        strbuf_append_str(buf_out, buff);
-        t = time(NULL);
-    }
-    close(pipeout[0]);
-
-    /* Prevent having zombie child process, and maybe collect status
-     * (note that status == NULL is ok too) */
-    waitpid(child, status, 0);
-
-    return strbuf_free_nobuf(buf_out);
-}
-
 static void gen_backtrace(const char *pDebugDumpDir, const char *pDebugInfoDirs, unsigned timeout_sec)
 {
     update_client(_("Generating backtrace"));
@@ -179,56 +105,6 @@ static void gen_backtrace(const char *pDebugDumpDir, const char *pDebugInfoDirs,
     waitpid(pid, NULL, 0);
 }
 
-static void GetIndependentBuildIdPC(const char *unstrip_n_output,
-                                    string& pIndependentBuildIdPC)
-{
-    // lines look like this:
-    // 0x400000+0x209000 23c77451cf6adff77fc1f5ee2a01d75de6511dda@0x40024c - - [exe]
-    // 0x400000+0x209000 ab3c8286aac6c043fd1bb1cc2a0b88ec29517d3e@0x40024c /bin/sleep /usr/lib/debug/bin/sleep.debug [exe]
-    // 0x7fff313ff000+0x1000 389c7475e3d5401c55953a425a2042ef62c4c7df@0x7fff313ff2f8 . - linux-vdso.so.1
-    const char *line = unstrip_n_output;
-    while (*line)
-    {
-        const char *eol = strchrnul(line, '\n');
-        const char *plus = (char*)memchr(line, '+', eol - line);
-        if (plus)
-        {
-            while (++plus < eol && *plus != '@')
-            {
-                if (!isspace(*plus))
-                {
-                    pIndependentBuildIdPC += *plus;
-                }
-            }
-        }
-        if (*eol != '\n') break;
-        line = eol + 1;
-    }
-}
-
-static char* run_unstrip_n(const char *pDebugDumpDir, unsigned timeout_sec)
-{
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR))
-        return NULL;
-
-    char *uid = dd_load_text(dd, CD_UID);
-    dd_close(dd);
-
-    char* args[4];
-    args[0] = (char*)"eu-unstrip";
-    args[1] = xasprintf("--core=%s/"FILENAME_COREDUMP, pDebugDumpDir);
-    args[2] = (char*)"-n";
-    args[3] = NULL;
-
-    char *out = exec_vp(args, xatoi_u(uid), /*redirect_stderr:*/ 0, timeout_sec, NULL);
-    free(uid);
-
-    free(args[1]);
-
-    return out;
-}
-
 /* Needs gdb feature from here: https://bugzilla.redhat.com/show_bug.cgi?id=528668
  * It is slated to be in F12/RHEL6.
  *
@@ -398,65 +274,53 @@ static void trim_debuginfo_cache(unsigned max_mb)
 
 string CAnalyzerCCpp::GetLocalUUID(const char *pDebugDumpDir)
 {
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR))
-        return string("");
+    string ret;
 
-    char *executable = dd_load_text(dd, FILENAME_EXECUTABLE);
-    char *package = dd_load_text(dd, FILENAME_PACKAGE);
-    dd_close(dd);
-
-    string independentBuildIdPC;
-    char *unstrip_n_output = run_unstrip_n(pDebugDumpDir, m_nGdbTimeoutSec);
-    if (unstrip_n_output)
-        GetIndependentBuildIdPC(unstrip_n_output, independentBuildIdPC);
-    else
-        VERB3 error_msg("run_unstrip_n() returns NULL, broken coredump/eu-unstrip?");
-
-    free(unstrip_n_output);
+    struct dump_dir *dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0);
+    if (!dd)
+        return ret; /* "" */
 
-    /* package variable has "firefox-3.5.6-1.fc11[.1]" format */
-    /* Remove distro suffix and maybe least significant version number */
-    char *p = package;
-    while (*p)
+    if (!dd_exist(dd, CD_UUID))
     {
-        if (*p == '.' && (p[1] < '0' || p[1] > '9'))
+        dd_close(dd);
+
+        pid_t pid = fork();
+        if (pid < 0)
         {
-            /* We found "XXXX.nondigitXXXX", trim this part */
-            *p = '\0';
-            break;
+            perror_msg("fork");
+            return ret; /* "" */
         }
-        p++;
-    }
-    char *first_dot = strchr(package, '.');
-    if (first_dot)
-    {
-        char *last_dot = strrchr(first_dot, '.');
-        if (last_dot != first_dot)
+        if (pid == 0) /* child */
         {
-            /* There are more than one dot: "1.2.3"
-             * Strip last part, we don't want to distinquish crashes
-             * in packages which differ only by minor release number.
-             */
-            *last_dot = '\0';
+            char *argv[4];  /* abrt-action-analyze-c -d DIR <NULL> */
+            char **pp = argv;
+            *pp++ = (char*)"abrt-action-analyze-c";
+            *pp++ = (char*)"-d";
+            *pp++ = (char*)pDebugDumpDir;
+            *pp = NULL;
+
+            execvp(argv[0], argv);
+            perror_msg_and_die("Can't execute '%s'", argv[0]);
         }
-    }
+        /* parent */
+        waitpid(pid, NULL, 0);
 
-    char *hash_str = xasprintf("%s%s%s", package, executable, independentBuildIdPC.c_str());
-    free(package);
-    free(executable);
-
-    char hash_str2[SHA1_RESULT_LEN*2 + 1];
-    create_hash(hash_str2, hash_str);
-    free(hash_str);
+        dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0);
+        if (!dd)
+            return ret; /* "" */
+    }
 
-    return hash_str2;
+    char *uuid = dd_load_text(dd, CD_UUID);
+    dd_close(dd);
+    ret = uuid;
+    free(uuid);
+    return ret;
 }
 
 string CAnalyzerCCpp::GetGlobalUUID(const char *pDebugDumpDir)
 {
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR))
+    struct dump_dir *dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0);
+    if (!dd)
         return string("");
 
     if (dd_exist(dd, FILENAME_DUPHASH))
@@ -627,8 +491,8 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force)
         return;
     }
 
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR))
+    struct dump_dir *dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0);
+    if (!dd)
         return;
 
     if (!force)
@@ -671,8 +535,8 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force)
     /* Create and store backtrace and its hash. */
     gen_backtrace(pDebugDumpDir, m_sDebugInfoDirs.c_str(), m_nGdbTimeoutSec);
 
-    dd = dd_init();
-    if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR))
+    dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0);
+    if (!dd)
     {
         free(build_ids);
         return;
diff --git a/lib/plugins/Kerneloops.cpp b/lib/plugins/Kerneloops.cpp
index d3ce2e8b..a847bfbf 100644
--- a/lib/plugins/Kerneloops.cpp
+++ b/lib/plugins/Kerneloops.cpp
@@ -125,8 +125,8 @@ std::string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir)
 {
     VERB3 log("Getting local universal unique identification");
 
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR))
+    struct dump_dir *dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0);
+    if (!dd)
         return std::string("");
 
     char *oops = dd_load_text(dd, FILENAME_BACKTRACE);
diff --git a/lib/plugins/KerneloopsScanner.cpp b/lib/plugins/KerneloopsScanner.cpp
index 0e7d4dc3..d187daa9 100644
--- a/lib/plugins/KerneloopsScanner.cpp
+++ b/lib/plugins/KerneloopsScanner.cpp
@@ -132,8 +132,8 @@ int save_oops_to_debug_dump(GList **oopsList)
         char *second_line = (char*)strchr(first_line, '\n'); /* never NULL */
         *second_line++ = '\0';
 
-        struct dump_dir *dd = dd_init();
-        if (dd_create(dd, path, /*uid:*/ 0))
+        struct dump_dir *dd = dd_create(path, /*uid:*/ 0);
+        if (dd)
         {
             dd_save_text(dd, FILENAME_ANALYZER, "Kerneloops");
             dd_save_text(dd, FILENAME_EXECUTABLE, "kernel");
diff --git a/lib/plugins/Makefile.am b/lib/plugins/Makefile.am
index 2e50cc2d..6e8c3f9c 100644
--- a/lib/plugins/Makefile.am
+++ b/lib/plugins/Makefile.am
@@ -66,7 +66,6 @@ UTILS_PATH=$(srcdir)/../utils
 # CCpp
 libCCpp_la_SOURCES = CCpp.cpp CCpp.h
 libCCpp_la_LDFLAGS = -avoid-version
-#libCCpp_la_LIBADD =
 libCCpp_la_CPPFLAGS = -Wall -Werror \
     -I$(INC_PATH) -I$(UTILS_PATH) \
     -DCCPP_HOOK_PATH=\"${libexecdir}/abrt-hook-ccpp\" \
@@ -140,7 +139,7 @@ libReportUploader_la_LIBADD = $(CURL_LIBS)
 libReportUploader_la_CPPFLAGS = -I$(INC_PATH) -I$(UTILS_PATH) $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\"
 
 # Python
-libPython_la_SOURCES = Python.h Python.cpp Python_hash.h Python_hash.cpp
+libPython_la_SOURCES = Python.h Python.cpp
 #libPython_la_LIBADD = $(NSS_LIBS)
 libPython_la_LDFLAGS = -avoid-version
 libPython_la_CPPFLAGS = -I$(INC_PATH) -I$(UTILS_PATH)
diff --git a/lib/plugins/Python.cpp b/lib/plugins/Python.cpp
index 5e4cc02a..ea3e1ade 100644
--- a/lib/plugins/Python.cpp
+++ b/lib/plugins/Python.cpp
@@ -19,14 +19,13 @@
 #include "abrtlib.h"
 #include "Python.h"
 #include "abrt_exception.h"
-#include "Python_hash.h"
 
 using namespace std;
 
 string CAnalyzerPython::GetLocalUUID(const char *pDebugDumpDir)
 {
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR))
+    struct dump_dir *dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0);
+    if (!dd)
         return string("");
 
     char *bt = dd_load_text(dd, FILENAME_BACKTRACE);
diff --git a/lib/plugins/Python_hash.cpp b/lib/plugins/Python_hash.cpp
deleted file mode 100644
index 36ddacdc..00000000
--- a/lib/plugins/Python_hash.cpp
+++ /dev/null
@@ -1,445 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- *  md5.c - Compute MD5 checksum of strings according to the
- *          definition of MD5 in RFC 1321 from April 1992.
- *
- *  Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
- *
- *  Copyright (C) 1995-1999 Free Software Foundation, Inc.
- *  Copyright (C) 2001 Manuel Novoa III
- *  Copyright (C) 2003 Glenn L. McGrath
- *  Copyright (C) 2003 Erik Andersen
- *
- *  Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- */
-#include "abrtlib.h"
-#include "Python_hash.h"
-#include <byteswap.h>
-
-#if defined(__BIG_ENDIAN__) && __BIG_ENDIAN__
-# define MD5_BIG_ENDIAN 1
-# define MD5_LITTLE_ENDIAN 0
-#elif __BYTE_ORDER == __BIG_ENDIAN
-# define MD5_BIG_ENDIAN 1
-# define MD5_LITTLE_ENDIAN 0
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-# define MD5_BIG_ENDIAN 0
-# define MD5_LITTLE_ENDIAN 1
-#else
-# error "Can't determine endianness"
-#endif
-
-/* SWAP_LEnn means "convert CPU<->little_endian if needed (by swapping bytes)" */
-#if MD5_BIG_ENDIAN
-# define SWAP_BE32(x) (x)
-# define SWAP_LE32(x) bswap_32(x)
-#else
-# define SWAP_BE32(x) bswap_32(x)
-# define SWAP_LE32(x) (x)
-#endif
-
-
-/* 0: fastest, 3: smallest */
-#define MD5_SIZE_VS_SPEED 3
-
-/* Initialize structure containing state of computation.
- * (RFC 1321, 3.3: Step 3)
- */
-void md5_begin(md5_ctx_t *ctx)
-{
-	ctx->A = 0x67452301;
-	ctx->B = 0xefcdab89;
-	ctx->C = 0x98badcfe;
-	ctx->D = 0x10325476;
-	ctx->total = 0;
-	ctx->buflen = 0;
-}
-
-/* These are the four functions used in the four steps of the MD5 algorithm
- * and defined in the RFC 1321.  The first function is a little bit optimized
- * (as found in Colin Plumbs public domain implementation).
- * #define FF(b, c, d) ((b & c) | (~b & d))
- */
-#define FF(b, c, d) (d ^ (b & (c ^ d)))
-#define FG(b, c, d) FF(d, b, c)
-#define FH(b, c, d) (b ^ c ^ d)
-#define FI(b, c, d) (c ^ (b | ~d))
-
-#define rotl32(w, s) (((w) << (s)) | ((w) >> (32 - (s))))
-
-/* Hash a single block, 64 bytes long and 4-byte aligned. */
-static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
-{
-	uint32_t correct_words[16];
-	const uint32_t *words = (const uint32_t *)buffer;
-
-#if MD5_SIZE_VS_SPEED > 0
-	static const uint32_t C_array[] = {
-		/* round 1 */
-		0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
-		0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
-		0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
-		0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
-		/* round 2 */
-		0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
-		0xd62f105d, 0x2441453, 0xd8a1e681, 0xe7d3fbc8,
-		0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
-		0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
-		/* round 3 */
-		0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
-		0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
-		0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05,
-		0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
-		/* round 4 */
-		0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
-		0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
-		0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
-		0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
-	};
-	static const char P_array[] = {
-# if MD5_SIZE_VS_SPEED > 1
-		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,	/* 1 */
-# endif
-		1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12,	/* 2 */
-		5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2,	/* 3 */
-		0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9	/* 4 */
-	};
-# if MD5_SIZE_VS_SPEED > 1
-	static const char S_array[] = {
-		7, 12, 17, 22,
-		5, 9, 14, 20,
-		4, 11, 16, 23,
-		6, 10, 15, 21
-	};
-# endif	/* MD5_SIZE_VS_SPEED > 1 */
-#endif
-	uint32_t A = ctx->A;
-	uint32_t B = ctx->B;
-	uint32_t C = ctx->C;
-	uint32_t D = ctx->D;
-
-	/* Process all bytes in the buffer with 64 bytes in each round of
-	   the loop.  */
-	uint32_t *cwp = correct_words;
-	uint32_t A_save = A;
-	uint32_t B_save = B;
-	uint32_t C_save = C;
-	uint32_t D_save = D;
-
-#if MD5_SIZE_VS_SPEED > 1
-	const uint32_t *pc;
-	const char *pp;
-	const char *ps;
-	int i;
-	uint32_t temp;
-
-	for (i = 0; i < 16; i++) {
-		cwp[i] = SWAP_LE32(words[i]);
-	}
-	words += 16;
-
-# if MD5_SIZE_VS_SPEED > 2
-	pc = C_array;
-	pp = P_array;
-	ps = S_array - 4;
-
-	for (i = 0; i < 64; i++) {
-		if ((i & 0x0f) == 0)
-			ps += 4;
-		temp = A;
-		switch (i >> 4) {
-		case 0:
-			temp += FF(B, C, D);
-			break;
-		case 1:
-			temp += FG(B, C, D);
-			break;
-		case 2:
-			temp += FH(B, C, D);
-			break;
-		case 3:
-			temp += FI(B, C, D);
-		}
-		temp += cwp[(int) (*pp++)] + *pc++;
-		temp = rotl32(temp, ps[i & 3]);
-		temp += B;
-		A = D;
-		D = C;
-		C = B;
-		B = temp;
-	}
-# else
-	pc = C_array;
-	pp = P_array;
-	ps = S_array;
-
-	for (i = 0; i < 16; i++) {
-		temp = A + FF(B, C, D) + cwp[(int) (*pp++)] + *pc++;
-		temp = rotl32(temp, ps[i & 3]);
-		temp += B;
-		A = D;
-		D = C;
-		C = B;
-		B = temp;
-	}
-	ps += 4;
-	for (i = 0; i < 16; i++) {
-		temp = A + FG(B, C, D) + cwp[(int) (*pp++)] + *pc++;
-		temp = rotl32(temp, ps[i & 3]);
-		temp += B;
-		A = D;
-		D = C;
-		C = B;
-		B = temp;
-	}
-	ps += 4;
-	for (i = 0; i < 16; i++) {
-		temp = A + FH(B, C, D) + cwp[(int) (*pp++)] + *pc++;
-		temp = rotl32(temp, ps[i & 3]);
-		temp += B;
-		A = D;
-		D = C;
-		C = B;
-		B = temp;
-	}
-	ps += 4;
-	for (i = 0; i < 16; i++) {
-		temp = A + FI(B, C, D) + cwp[(int) (*pp++)] + *pc++;
-		temp = rotl32(temp, ps[i & 3]);
-		temp += B;
-		A = D;
-		D = C;
-		C = B;
-		B = temp;
-	}
-
-# endif /* MD5_SIZE_VS_SPEED > 2 */
-#else
-	/* First round: using the given function, the context and a constant
-	   the next context is computed.  Because the algorithms processing
-	   unit is a 32-bit word and it is determined to work on words in
-	   little endian byte order we perhaps have to change the byte order
-	   before the computation.  To reduce the work for the next steps
-	   we store the swapped words in the array CORRECT_WORDS.  */
-# define OP(a, b, c, d, s, T) \
-	do { \
-		a += FF(b, c, d) + (*cwp++ = SWAP_LE32(*words)) + T; \
-		++words; \
-		a = rotl32(a, s); \
-		a += b; \
-	} while (0)
-
-	/* Before we start, one word to the strange constants.
-	   They are defined in RFC 1321 as
-	   T[i] = (int)(4294967296.0 * fabs(sin(i))), i=1..64
-	 */
-
-# if MD5_SIZE_VS_SPEED == 1
-	const uint32_t *pc;
-	const char *pp;
-	int i;
-# endif	/* MD5_SIZE_VS_SPEED */
-
-	/* Round 1.  */
-# if MD5_SIZE_VS_SPEED == 1
-	pc = C_array;
-	for (i = 0; i < 4; i++) {
-		OP(A, B, C, D, 7, *pc++);
-		OP(D, A, B, C, 12, *pc++);
-		OP(C, D, A, B, 17, *pc++);
-		OP(B, C, D, A, 22, *pc++);
-	}
-# else
-	OP(A, B, C, D, 7, 0xd76aa478);
-	OP(D, A, B, C, 12, 0xe8c7b756);
-	OP(C, D, A, B, 17, 0x242070db);
-	OP(B, C, D, A, 22, 0xc1bdceee);
-	OP(A, B, C, D, 7, 0xf57c0faf);
-	OP(D, A, B, C, 12, 0x4787c62a);
-	OP(C, D, A, B, 17, 0xa8304613);
-	OP(B, C, D, A, 22, 0xfd469501);
-	OP(A, B, C, D, 7, 0x698098d8);
-	OP(D, A, B, C, 12, 0x8b44f7af);
-	OP(C, D, A, B, 17, 0xffff5bb1);
-	OP(B, C, D, A, 22, 0x895cd7be);
-	OP(A, B, C, D, 7, 0x6b901122);
-	OP(D, A, B, C, 12, 0xfd987193);
-	OP(C, D, A, B, 17, 0xa679438e);
-	OP(B, C, D, A, 22, 0x49b40821);
-# endif /* MD5_SIZE_VS_SPEED == 1 */
-
-	/* For the second to fourth round we have the possibly swapped words
-	   in CORRECT_WORDS.  Redefine the macro to take an additional first
-	   argument specifying the function to use.  */
-# undef OP
-# define OP(f, a, b, c, d, k, s, T) \
-	do { \
-		a += f(b, c, d) + correct_words[k] + T; \
-		a = rotl32(a, s); \
-		a += b; \
-	} while (0)
-
-	/* Round 2.  */
-# if MD5_SIZE_VS_SPEED == 1
-	pp = P_array;
-	for (i = 0; i < 4; i++) {
-		OP(FG, A, B, C, D, (int) (*pp++), 5, *pc++);
-		OP(FG, D, A, B, C, (int) (*pp++), 9, *pc++);
-		OP(FG, C, D, A, B, (int) (*pp++), 14, *pc++);
-		OP(FG, B, C, D, A, (int) (*pp++), 20, *pc++);
-	}
-# else
-	OP(FG, A, B, C, D, 1, 5, 0xf61e2562);
-	OP(FG, D, A, B, C, 6, 9, 0xc040b340);
-	OP(FG, C, D, A, B, 11, 14, 0x265e5a51);
-	OP(FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
-	OP(FG, A, B, C, D, 5, 5, 0xd62f105d);
-	OP(FG, D, A, B, C, 10, 9, 0x02441453);
-	OP(FG, C, D, A, B, 15, 14, 0xd8a1e681);
-	OP(FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
-	OP(FG, A, B, C, D, 9, 5, 0x21e1cde6);
-	OP(FG, D, A, B, C, 14, 9, 0xc33707d6);
-	OP(FG, C, D, A, B, 3, 14, 0xf4d50d87);
-	OP(FG, B, C, D, A, 8, 20, 0x455a14ed);
-	OP(FG, A, B, C, D, 13, 5, 0xa9e3e905);
-	OP(FG, D, A, B, C, 2, 9, 0xfcefa3f8);
-	OP(FG, C, D, A, B, 7, 14, 0x676f02d9);
-	OP(FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
-# endif /* MD5_SIZE_VS_SPEED == 1 */
-
-	/* Round 3.  */
-# if MD5_SIZE_VS_SPEED == 1
-	for (i = 0; i < 4; i++) {
-		OP(FH, A, B, C, D, (int) (*pp++), 4, *pc++);
-		OP(FH, D, A, B, C, (int) (*pp++), 11, *pc++);
-		OP(FH, C, D, A, B, (int) (*pp++), 16, *pc++);
-		OP(FH, B, C, D, A, (int) (*pp++), 23, *pc++);
-	}
-# else
-	OP(FH, A, B, C, D, 5, 4, 0xfffa3942);
-	OP(FH, D, A, B, C, 8, 11, 0x8771f681);
-	OP(FH, C, D, A, B, 11, 16, 0x6d9d6122);
-	OP(FH, B, C, D, A, 14, 23, 0xfde5380c);
-	OP(FH, A, B, C, D, 1, 4, 0xa4beea44);
-	OP(FH, D, A, B, C, 4, 11, 0x4bdecfa9);
-	OP(FH, C, D, A, B, 7, 16, 0xf6bb4b60);
-	OP(FH, B, C, D, A, 10, 23, 0xbebfbc70);
-	OP(FH, A, B, C, D, 13, 4, 0x289b7ec6);
-	OP(FH, D, A, B, C, 0, 11, 0xeaa127fa);
-	OP(FH, C, D, A, B, 3, 16, 0xd4ef3085);
-	OP(FH, B, C, D, A, 6, 23, 0x04881d05);
-	OP(FH, A, B, C, D, 9, 4, 0xd9d4d039);
-	OP(FH, D, A, B, C, 12, 11, 0xe6db99e5);
-	OP(FH, C, D, A, B, 15, 16, 0x1fa27cf8);
-	OP(FH, B, C, D, A, 2, 23, 0xc4ac5665);
-# endif /* MD5_SIZE_VS_SPEED == 1 */
-
-	/* Round 4.  */
-# if MD5_SIZE_VS_SPEED == 1
-	for (i = 0; i < 4; i++) {
-		OP(FI, A, B, C, D, (int) (*pp++), 6, *pc++);
-		OP(FI, D, A, B, C, (int) (*pp++), 10, *pc++);
-		OP(FI, C, D, A, B, (int) (*pp++), 15, *pc++);
-		OP(FI, B, C, D, A, (int) (*pp++), 21, *pc++);
-	}
-# else
-	OP(FI, A, B, C, D, 0, 6, 0xf4292244);
-	OP(FI, D, A, B, C, 7, 10, 0x432aff97);
-	OP(FI, C, D, A, B, 14, 15, 0xab9423a7);
-	OP(FI, B, C, D, A, 5, 21, 0xfc93a039);
-	OP(FI, A, B, C, D, 12, 6, 0x655b59c3);
-	OP(FI, D, A, B, C, 3, 10, 0x8f0ccc92);
-	OP(FI, C, D, A, B, 10, 15, 0xffeff47d);
-	OP(FI, B, C, D, A, 1, 21, 0x85845dd1);
-	OP(FI, A, B, C, D, 8, 6, 0x6fa87e4f);
-	OP(FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
-	OP(FI, C, D, A, B, 6, 15, 0xa3014314);
-	OP(FI, B, C, D, A, 13, 21, 0x4e0811a1);
-	OP(FI, A, B, C, D, 4, 6, 0xf7537e82);
-	OP(FI, D, A, B, C, 11, 10, 0xbd3af235);
-	OP(FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
-	OP(FI, B, C, D, A, 9, 21, 0xeb86d391);
-# endif	/* MD5_SIZE_VS_SPEED == 1 */
-#endif	/* MD5_SIZE_VS_SPEED > 1 */
-
-	/* Add the starting values of the context.  */
-	A += A_save;
-	B += B_save;
-	C += C_save;
-	D += D_save;
-
-	/* Put checksum in context given as argument.  */
-	ctx->A = A;
-	ctx->B = B;
-	ctx->C = C;
-	ctx->D = D;
-}
-
-/* Feed data through a temporary buffer to call md5_hash_aligned_block()
- * with chunks of data that are 4-byte aligned and a multiple of 64 bytes.
- * This function's internal buffer remembers previous data until it has 64
- * bytes worth to pass on.  Call md5_end() to flush this buffer. */
-void md5_hash(const void *buffer, size_t len, md5_ctx_t *ctx)
-{
-	char *buf = (char *)buffer;
-
-	/* RFC 1321 specifies the possible length of the file up to 2^64 bits,
-	 * Here we only track the number of bytes.  */
-	ctx->total += len;
-
-	/* Process all input. */
-	while (len) {
-		unsigned i = 64 - ctx->buflen;
-
-		/* Copy data into aligned buffer. */
-		if (i > len) i = len;
-		memcpy(ctx->buffer + ctx->buflen, buf, i);
-		len -= i;
-		ctx->buflen += i;
-		buf += i;
-
-		/* When buffer fills up, process it. */
-		if (ctx->buflen == 64) {
-			md5_hash_block(ctx->buffer, ctx);
-			ctx->buflen = 0;
-		}
-	}
-}
-
-/* Process the remaining bytes in the buffer and put result from CTX
- * in first 16 bytes following RESBUF.  The result is always in little
- * endian byte order, so that a byte-wise output yields to the wanted
- * ASCII representation of the message digest.
- */
-void md5_end(void *resbuf, md5_ctx_t *ctx)
-{
-	char *buf = ctx->buffer;
-	int i;
-
-	/* Pad data to block size.  */
-	buf[ctx->buflen++] = 0x80;
-	memset(buf + ctx->buflen, 0, 128 - ctx->buflen);
-
-	/* Put the 64-bit file length in *bits* at the end of the buffer.  */
-	ctx->total <<= 3;
-	if (ctx->buflen > 56)
-		buf += 64;
-	for (i = 0; i < 8; i++)
-		buf[56 + i] = ctx->total >> (i*8);
-
-	/* Process last bytes.  */
-	if (buf != ctx->buffer)
-		md5_hash_block(ctx->buffer, ctx);
-	md5_hash_block(buf, ctx);
-
-	/* The MD5 result is in little endian byte order.
-	 * We (ab)use the fact that A-D are consecutive in memory.
-	 */
-#if MD5_BIG_ENDIAN
-	ctx->A = SWAP_LE32(ctx->A);
-	ctx->B = SWAP_LE32(ctx->B);
-	ctx->C = SWAP_LE32(ctx->C);
-	ctx->D = SWAP_LE32(ctx->D);
-#endif
-	memcpy(resbuf, &ctx->A, sizeof(ctx->A) * 4);
-}
diff --git a/lib/plugins/Python_hash.h b/lib/plugins/Python_hash.h
deleted file mode 100644
index cc1d2c43..00000000
--- a/lib/plugins/Python_hash.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- *  md5.c - Compute MD5 checksum of strings according to the
- *          definition of MD5 in RFC 1321 from April 1992.
- *
- *  Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
- *
- *  Copyright (C) 1995-1999 Free Software Foundation, Inc.
- *  Copyright (C) 2001 Manuel Novoa III
- *  Copyright (C) 2003 Glenn L. McGrath
- *  Copyright (C) 2003 Erik Andersen
- *
- *  Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- */
-
-#define MD5_RESULT_LEN 16
-
-typedef struct md5_ctx_t {
-        uint32_t A;
-        uint32_t B;
-        uint32_t C;
-        uint32_t D;
-        uint64_t total;
-        uint32_t buflen;
-        char buffer[128];
-} md5_ctx_t;
-void md5_begin(md5_ctx_t *ctx);
-void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
-void md5_end(void *resbuf, md5_ctx_t *ctx);
diff --git a/lib/plugins/RunApp.cpp b/lib/plugins/RunApp.cpp
index 3ae6638b..b606537a 100644
--- a/lib/plugins/RunApp.cpp
+++ b/lib/plugins/RunApp.cpp
@@ -57,8 +57,8 @@ void CActionRunApp::Run(const char *pActionDir, const char *pArgs, int force)
 
     if (args.size() > FILENAME)
     {
-        struct dump_dir *dd = dd_init();
-        if (!dd_opendir(dd, pActionDir, DD_CLOSE_ON_OPEN_ERR))
+        struct dump_dir *dd = dd_opendir(pActionDir, /*flags:*/ 0);
+        if (!dd)
             return;
 
         dd_save_binary(dd, args[FILENAME].c_str(), cmd_out, cmd_out_size);
diff --git a/lib/plugins/SOSreport.cpp b/lib/plugins/SOSreport.cpp
index 5c1b658a..36a768fd 100644
--- a/lib/plugins/SOSreport.cpp
+++ b/lib/plugins/SOSreport.cpp
@@ -50,8 +50,8 @@ void CActionSOSreport::Run(const char *pActionDir, const char *pArgs, int force)
 {
     if (!force)
     {
-        struct dump_dir *dd = dd_init();
-        if (!dd_opendir(dd, pActionDir, DD_CLOSE_ON_OPEN_ERR))
+        struct dump_dir *dd = dd_opendir(pActionDir, /*flags:*/ 0);
+        if (!dd)
             return;
 
         bool bt_exists = dd_exist(dd, "sosreport.tar.bz2") || dd_exist(dd, "sosreport.tar.xz");