[Forensics-changes] [steghide] 01/01: Import Debian patch 0.5.1-7.1

[Giovani Augusto Ferreira]

This is an automated email from the git hooks/post-receive script.

giovani-guest pushed a commit to branch debian
in repository steghide.

commit a2d0d57d3f23625303e6c9145a29cc86a0d50087
Author: Erinn Clark <erinn at double-helix.org>
Date:   Thu Apr 27 22:17:11 2006 -0400

    Import Debian patch 0.5.1-7.1
---
 debian/changelog | 10 ++++++++++
 src/EmbData.cc   |  1 +
 src/MHashPP.cc   |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 383e61d..dbf2d4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+steghide (0.5.1-7.1) unstable; urgency=high
+
+  * Non-maintainer upload
+  * EmbData.cc: Explicitly include config.h to work around libmhash's
+    namespace abuse of VERSION
+  * Forcefully cast the return of mhash_get_hash_name from uint8_t * to char *
+  * Happy birthday, vorlon, closes: #360479
+
+ -- Erinn Clark <erinn at double-helix.org>  Thu, 27 Apr 2006 22:17:11 -0400
+
 steghide (0.5.1-7) unstable; urgency=low
 
   * Updated config.sub and config.guess to make it possible to build on
diff --git a/src/EmbData.cc b/src/EmbData.cc
index d91a095..c98c7eb 100644
--- a/src/EmbData.cc
+++ b/src/EmbData.cc
@@ -26,6 +26,7 @@
 #include "MCryptPP.h"
 #include "MHashPP.h"
 #include "common.h"
+#include "config.h"
 
 EmbData::EmbData (MODE m, std::string pp, std::string fn)
 	: Mode(m), Passphrase(pp), FileName(fn)
diff --git a/src/MHashPP.cc b/src/MHashPP.cc
index 27b3d73..43f2526 100755
--- a/src/MHashPP.cc
+++ b/src/MHashPP.cc
@@ -120,7 +120,7 @@ std::string MHashPP::getAlgorithmName ()
 
 std::string MHashPP::getAlgorithmName (hashid id)
 {
-	char *name = mhash_get_hash_name (id) ;
+	char *name = (char *) mhash_get_hash_name (id) ;
 	std::string retval ;
 	if (name == NULL) {
 		retval = std::string ("<algorithm not found>") ;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/steghide.git