Attachment #151791 for bug #196841

View | Details | Raw Unified | Return to bug 196841
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= doxygen	4	PORTNAME= doxygen
5	PORTVERSION= 1.8.9	5	PORTVERSION= 1.8.9.1
6	PORTEPOCH= 2	6	PORTEPOCH= 2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \	8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (doxygen-1.8.9.src.tar.gz) = f0dd662fb98c394c20deed5b00b29d73d9bee8ea1a52f7a687dd9b70f5444fc6	1	SHA256 (doxygen-1.8.9.1.src.tar.gz) = d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec
2	SIZE (doxygen-1.8.9.src.tar.gz) = 5006046	2	SIZE (doxygen-1.8.9.1.src.tar.gz) = 5007458




--- src/definition.cpp.orig	2015-01-03 22:38:57 UTC
+++ src/definition.cpp
@@ -17,6 +17,7 @@
 
 #include <ctype.h>

 #include "md5.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -537,13 +538,11 @@ void Definition::writeDocAnchorsToTagFil
 
 bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
 {

   // double whitespaces...
   QCString docStr = doc.simplifyWhiteSpace();
-  MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData());
   //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
   //    name().data(),doc.data(),sigStr.data(),sigList.data());
   if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it




--- src/dirdef.cpp.orig	2015-01-03 22:38:57 UTC
+++ src/dirdef.cpp
@@ -1,3 +1,4 @@
+#include <sys/types.h>
 #include "md5.h"
 
 #include "dirdef.h"
@@ -81,10 +82,8 @@ void DirDef::addFile(FileDef *fd)
 static QCString encodeDirName(const QCString &anchor)
 {
   // convert to md5 hash
-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData());
   return sigStr;
 
   // old algorithm




--- src/dot.cpp.orig	2015-01-03 22:38:57 UTC
+++ src/dot.cpp
@@ -39,6 +39,7 @@
 #include "dirdef.h"

 #include "md5.h"
 #include "memberlist.h"
 #include "groupdef.h"
@@ -2296,10 +2297,8 @@ void DotGfxHierarchyTable::createGraph(D
   }
   writeGraphFooter(md5stream);
   resetReNumbering();

-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
       !checkDeliverables(absImgName,absMapName))
@@ -3024,10 +3023,8 @@ QCString computeMd5Signature(DotNode *ro
     }
   }
   writeGraphFooter(md5stream);

-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
   if (reNumber)
   {
     resetReNumbering();
@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
   QGString theGraph;
   FTextStream md5stream(&theGraph);
   m_dir->writeDepGraph(md5stream);

-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
       !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat
   md5stream << "  Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
   md5stream << "  Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
   writeGraphFooter(md5stream);

-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   QCString absBaseName = (QCString)path+"/graph_legend";
   QCString absDotName  = absBaseName+".dot";
   QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
@@ -4499,10 +4492,8 @@ QCString DotGroupCollaboration::writeGra
 
   writeGraphFooter(md5stream);
   resetReNumbering();

-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
   QCString baseName    = m_diskName;
   QCString imgName     = baseName+"."+imgExt;




--- src/memberdef.cpp.orig	2015-01-03 22:38:57 UTC
+++ src/memberdef.cpp
@@ -17,6 +17,7 @@
 #include <qglobal.h>
 #include <qregexp.h>

 #include "md5.h"
 #include "memberdef.h"
 #include "membername.h"
@@ -3326,11 +3327,9 @@ void MemberDef::setAnchor()
   }
 
   // convert to md5 hash

   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
   //printf("memAnchor=%s\n",memAnchor.data());
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
   m_impl->anc = "a"+sigStr;
 }
 




--- src/membergroup.cpp.orig	2015-01-03 22:38:57 UTC
+++ src/membergroup.cpp
@@ -28,6 +28,7 @@
 #include "docparser.h"
 #include "marshal.h"

 #include "md5.h"
 
 //static QCString idToName(int id)
@@ -307,12 +308,10 @@ void MemberGroup::setInGroup(bool b)
 
 QCString MemberGroup::anchor() const
 {

   QCString locHeader = grpHeader;
   if (locHeader.isEmpty()) locHeader="[NOHEADER]";
-  MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.rawData());
   return "amgrp"+sigStr;
 }
 




--- src/util.cpp.orig	2015-01-03 22:45:44 UTC
+++ src/util.cpp
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <math.h>

 #include "md5.h"
 
 #include <qregexp.h>
@@ -5335,16 +5336,16 @@ QCString convertNameToFile(const char *n
     if (resultLen>=128) // prevent names that cannot be created!
     {
       // third algorithm based on MD5 hash

-      uchar md5_sig[16];
       QCString sigStr(33);
-      MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
-      MD5SigToString(md5_sig,sigStr.rawData(),33);
+      MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
       result=result.left(128-32)+sigStr; 
     }
   }

 
 #if MAP_ALGO==ALGO_COUNT 
     // old algorithm, has the problem that after regeneration the
@@ -5375,12 +5376,13 @@ QCString convertNameToFile(const char *n
     l2Dir = (dirNum>>4)&0xff;
 #elif MAP_ALGO==ALGO_MD5
     // third algorithm based on MD5 hash

Return to bug 196841

Lines 1-5 Link Here

(-)files/patch-md5-definition (-5 / +5 lines)
1	--- src/definition.cpp-orig 2014-06-11 20:09:07.000000000 +0200	1	--- src/definition.cpp.orig 2015-01-03 22:38:57 UTC
2	+++ src/definition.cpp 2014-06-11 20:12:32.000000000 +0200	2	+++ src/definition.cpp
3	@@ -17,6 +17,7 @@	3	@@ -17,6 +17,7 @@
4		4
5	#include <ctype.h>	5	#include <ctype.h>
Lines 8-14 Link Here
8	#include "md5.h"	8	#include "md5.h"
9	#include <stdio.h>	9	#include <stdio.h>
10	#include <stdlib.h>	10	#include <stdlib.h>
11	@@ -539,13 +540,11 @@	11	@@ -537,13 +538,11 @@ void Definition::writeDocAnchorsToTagFil
12		12
13	bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList)	13	bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
14	{	14	{
Lines 18-25 Link Here
18	// double whitespaces...	18	// double whitespaces...
19	QCString docStr = doc.simplifyWhiteSpace();	19	QCString docStr = doc.simplifyWhiteSpace();
20	- MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);	20	- MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);
21	- MD5SigToString(md5_sig,sigStr.data(),33);	21	- MD5SigToString(md5_sig,sigStr.rawData(),33);
22	+ MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.data());	22	+ MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData());
23	//printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",	23	//printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
24	// name().data(),doc.data(),sigStr.data(),sigList.data());	24	// name().data(),doc.data(),sigStr.data(),sigList.data());
25	if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it	25	if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it

Lines 1-19 Link Here

(-)files/patch-md5-dirdef (-7 / +7 lines)
1	--- src/dirdef.cpp-orig 2014-06-11 20:11:16.000000000 +0200	1	--- src/dirdef.cpp.orig 2015-01-03 22:38:57 UTC
2	+++ src/dirdef.cpp 2014-06-11 20:11:59.000000000 +0200	2	+++ src/dirdef.cpp
3	@@ -1,3 +1,4 @@	3	@@ -1,3 +1,4 @@
4	+#include <sys/types.h>	4	+#include <sys/types.h>
5	#include "md5.h"	5	#include "md5.h"
6		6
7	#include "dirdef.h"	7	#include "dirdef.h"
8	@@ -83,10 +84,8 @@	8	@@ -81,10 +82,8 @@ void DirDef::addFile(FileDef *fd)
9	QCString result;	9	static QCString encodeDirName(const QCString &anchor)
10		10	{
11	// convert to md5 hash	11	// convert to md5 hash
12	- uchar md5_sig[16];	12	- uchar md5_sig[16];
13	QCString sigStr(33);	13	QCString sigStr(33);
14	- MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);	14	- MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);
15	- MD5SigToString(md5_sig,sigStr.data(),33);	15	- MD5SigToString(md5_sig,sigStr.rawData(),33);
16	+ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.data());	16	+ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData());
17	return sigStr;	17	return sigStr;
18		18
19	// old algorithm	19	// old algorithm

Lines 1-4 Link Here

(-)files/patch-md5-dot (-16 / +16 lines)
1	--- src/dot.cpp.orig 2014-12-25 12:44:06 UTC	1	--- src/dot.cpp.orig 2015-01-03 22:38:57 UTC
2	+++ src/dot.cpp	2	+++ src/dot.cpp
3	@@ -39,6 +39,7 @@	3	@@ -39,6 +39,7 @@
4	#include "dirdef.h"	4	#include "dirdef.h"
Lines 8-14 Link Here
8	#include "md5.h"	8	#include "md5.h"
9	#include "memberlist.h"	9	#include "memberlist.h"
10	#include "groupdef.h"	10	#include "groupdef.h"
11	@@ -2297,10 +2298,8 @@ void DotGfxHierarchyTable::createGraph(D	11	@@ -2296,10 +2297,8 @@ void DotGfxHierarchyTable::createGraph(D
12	}	12	}
13	writeGraphFooter(md5stream);	13	writeGraphFooter(md5stream);
14	resetReNumbering();	14	resetReNumbering();
Lines 15-26 Link Here
15	- uchar md5_sig[16];	15	- uchar md5_sig[16];
16	QCString sigStr(33);	16	QCString sigStr(33);
17	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);	17	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
18	- MD5SigToString(md5_sig,sigStr.data(),33);	18	- MD5SigToString(md5_sig,sigStr.rawData(),33);
19	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());	19	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
20	bool regenerate=FALSE;	20	bool regenerate=FALSE;
21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|	21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
22	!checkDeliverables(absImgName,absMapName))	22	!checkDeliverables(absImgName,absMapName))
23	@@ -3025,10 +3024,8 @@ QCString computeMd5Signature(DotNode *ro	23	@@ -3024,10 +3023,8 @@ QCString computeMd5Signature(DotNode *ro
24	}	24	}
25	}	25	}
26	writeGraphFooter(md5stream);	26	writeGraphFooter(md5stream);
Lines 27-38 Link Here
27	- uchar md5_sig[16];	27	- uchar md5_sig[16];
28	QCString sigStr(33);	28	QCString sigStr(33);
29	- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);	29	- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
30	- MD5SigToString(md5_sig,sigStr.data(),33);	30	- MD5SigToString(md5_sig,sigStr.rawData(),33);
31	+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.data());	31	+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
32	if (reNumber)	32	if (reNumber)
33	{	33	{
34	resetReNumbering();	34	resetReNumbering();
35	@@ -3959,10 +3956,8 @@ QCString DotDirDeps::writeGraph(FTextStr	35	@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
36	QGString theGraph;	36	QGString theGraph;
37	FTextStream md5stream(&theGraph);	37	FTextStream md5stream(&theGraph);
38	m_dir->writeDepGraph(md5stream);	38	m_dir->writeDepGraph(md5stream);
Lines 39-50 Link Here
39	- uchar md5_sig[16];	39	- uchar md5_sig[16];
40	QCString sigStr(33);	40	QCString sigStr(33);
41	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);	41	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
42	- MD5SigToString(md5_sig,sigStr.data(),33);	42	- MD5SigToString(md5_sig,sigStr.rawData(),33);
43	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());	43	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
44	bool regenerate=FALSE;	44	bool regenerate=FALSE;
45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|	45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
46	!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :	46	!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
47	@@ -4105,10 +4100,8 @@ void generateGraphLegend(const char *pat	47	@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat
48	md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";	48	md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
49	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";	49	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
50	writeGraphFooter(md5stream);	50	writeGraphFooter(md5stream);
Lines 51-62 Link Here
51	- uchar md5_sig[16];	51	- uchar md5_sig[16];
52	QCString sigStr(33);	52	QCString sigStr(33);
53	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);	53	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
54	- MD5SigToString(md5_sig,sigStr.data(),33);	54	- MD5SigToString(md5_sig,sigStr.rawData(),33);
55	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());	55	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
56	QCString absBaseName = (QCString)path+"/graph_legend";	56	QCString absBaseName = (QCString)path+"/graph_legend";
57	QCString absDotName = absBaseName+".dot";	57	QCString absDotName = absBaseName+".dot";
58	QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");	58	QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
59	@@ -4505,10 +4498,8 @@ QCString DotGroupCollaboration::writeGra	59	@@ -4499,10 +4492,8 @@ QCString DotGroupCollaboration::writeGra
60		60
61	writeGraphFooter(md5stream);	61	writeGraphFooter(md5stream);
62	resetReNumbering();	62	resetReNumbering();
Lines 63-70 Link Here
63	- uchar md5_sig[16];	63	- uchar md5_sig[16];
64	QCString sigStr(33);	64	QCString sigStr(33);
65	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);	65	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
66	- MD5SigToString(md5_sig,sigStr.data(),33);	66	- MD5SigToString(md5_sig,sigStr.rawData(),33);
67	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());	67	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
68	QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");	68	QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
69	QCString baseName = m_diskName;	69	QCString baseName = m_diskName;
70	QCString imgName = baseName+"."+imgExt;	70	QCString imgName = baseName+"."+imgExt;

Lines 1-5 Link Here

(-)files/patch-md5-memberdef (-5 / +5 lines)
1	--- src/memberdef.cpp-orig 2014-06-11 20:17:47.000000000 +0200	1	--- src/memberdef.cpp.orig 2015-01-03 22:38:57 UTC
2	+++ src/memberdef.cpp 2014-06-11 20:19:38.000000000 +0200	2	+++ src/memberdef.cpp
3	@@ -17,6 +17,7 @@	3	@@ -17,6 +17,7 @@
4	#include <qglobal.h>	4	#include <qglobal.h>
5	#include <qregexp.h>	5	#include <qregexp.h>
Lines 8-14 Link Here
8	#include "md5.h"	8	#include "md5.h"
9	#include "memberdef.h"	9	#include "memberdef.h"
10	#include "membername.h"	10	#include "membername.h"
11	@@ -3305,11 +3306,9 @@	11	@@ -3326,11 +3327,9 @@ void MemberDef::setAnchor()
12	}	12	}
13		13
14	// convert to md5 hash	14	// convert to md5 hash
Lines 16-23 Link Here
16	QCString sigStr(33);	16	QCString sigStr(33);
17	- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);	17	- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
18	//printf("memAnchor=%s\n",memAnchor.data());	18	//printf("memAnchor=%s\n",memAnchor.data());
19	- MD5SigToString(md5_sig,sigStr.data(),33);	19	- MD5SigToString(md5_sig,sigStr.rawData(),33);
20	+ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.data());	20	+ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
21	m_impl->anc = "a"+sigStr;	21	m_impl->anc = "a"+sigStr;
22	}	22	}
23		23

Lines 1-5 Link Here

(-)files/patch-md5-membergroup (-5 / +5 lines)
1	--- src/membergroup.cpp-orig 2014-06-11 20:23:51.000000000 +0200	1	--- src/membergroup.cpp.orig 2015-01-03 22:38:57 UTC
2	+++ src/membergroup.cpp 2014-06-11 20:24:25.000000000 +0200	2	+++ src/membergroup.cpp
3	@@ -28,6 +28,7 @@	3	@@ -28,6 +28,7 @@
4	#include "docparser.h"	4	#include "docparser.h"
5	#include "marshal.h"	5	#include "marshal.h"
Lines 8-14 Link Here
8	#include "md5.h"	8	#include "md5.h"
9		9
10	//static QCString idToName(int id)	10	//static QCString idToName(int id)
11	@@ -307,12 +308,10 @@	11	@@ -307,12 +308,10 @@ void MemberGroup::setInGroup(bool b)
12		12
13	QCString MemberGroup::anchor() const	13	QCString MemberGroup::anchor() const
14	{	14	{
Lines 17-24 Link Here
17	QCString locHeader = grpHeader;	17	QCString locHeader = grpHeader;
18	if (locHeader.isEmpty()) locHeader="[NOHEADER]";	18	if (locHeader.isEmpty()) locHeader="[NOHEADER]";
19	- MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig);	19	- MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig);
20	- MD5SigToString(md5_sig,sigStr.data(),33);	20	- MD5SigToString(md5_sig,sigStr.rawData(),33);
21	+ MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.data());	21	+ MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.rawData());
22	return "amgrp"+sigStr;	22	return "amgrp"+sigStr;
23	}	23	}
24		24

Lines 1-5 Link Here

(-)files/patch-md5-util (-6 / +6 lines)
1	--- src/util.cpp-orig 2014-06-11 20:24:54.000000000 +0200	1	--- src/util.cpp.orig 2015-01-03 22:45:44 UTC
2	+++ src/util.cpp 2014-06-11 20:26:48.000000000 +0200	2	+++ src/util.cpp
3	@@ -19,6 +19,7 @@	3	@@ -19,6 +19,7 @@
4	#include <errno.h>	4	#include <errno.h>
5	#include <math.h>	5	#include <math.h>
Lines 8-14 Link Here
8	#include "md5.h"	8	#include "md5.h"
9		9
10	#include <qregexp.h>	10	#include <qregexp.h>
11	@@ -5283,16 +5284,16 @@	11	@@ -5335,16 +5336,16 @@ QCString convertNameToFile(const char *n
12	if (resultLen>=128) // prevent names that cannot be created!	12	if (resultLen>=128) // prevent names that cannot be created!
13	{	13	{
14	// third algorithm based on MD5 hash	14	// third algorithm based on MD5 hash
Lines 15-22 Link Here
15	- uchar md5_sig[16];	15	- uchar md5_sig[16];
16	QCString sigStr(33);	16	QCString sigStr(33);
17	- MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);	17	- MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
18	- MD5SigToString(md5_sig,sigStr.data(),33);	18	- MD5SigToString(md5_sig,sigStr.rawData(),33);
19	+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.data());	19	+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
20	result=result.left(128-32)+sigStr;	20	result=result.left(128-32)+sigStr;
21	}	21	}
22	}	22	}
Lines 28-34 Link Here
28		28
29	#if MAP_ALGO==ALGO_COUNT	29	#if MAP_ALGO==ALGO_COUNT
30	// old algorithm, has the problem that after regeneration the	30	// old algorithm, has the problem that after regeneration the
31	@@ -5323,12 +5324,13 @@	31	@@ -5375,12 +5376,13 @@ QCString convertNameToFile(const char *n
32	l2Dir = (dirNum>>4)&0xff;	32	l2Dir = (dirNum>>4)&0xff;
33	#elif MAP_ALGO==ALGO_MD5	33	#elif MAP_ALGO==ALGO_MD5
34	// third algorithm based on MD5 hash	34	// third algorithm based on MD5 hash