Attachment #84739 for bug #120796

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

Lines 6-16 Link Here

(-)Makefile (-4 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= osslsigncode	8	PORTNAME= osslsigncode
9	PORTVERSION= 1.2	9	PORTVERSION= 1.3
10	PORTREVISION= 1
11	CATEGORIES= security devel	10	CATEGORIES= security devel
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= SF
13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		12
15	MAINTAINER= snb@threerings.net	13	MAINTAINER= snb@threerings.net
16	COMMENT= OpenSSL-based signcode utility	14	COMMENT= OpenSSL-based signcode utility

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (osslsigncode-1.2.tar.gz) = e97a583463feddcce524cc4067a57e04	1	MD5 (osslsigncode-1.3.tar.gz) = f269f427ae31c9c926c0e7d88768e9b4
2	SHA256 (osslsigncode-1.2.tar.gz) = 5cd55fa974b06bf89ee128137a969e58a8c6ea1df20b100ddb6b23a58682bec8	2	SHA256 (osslsigncode-1.3.tar.gz) = c6dfeb86bb54ad0a5dd81fd1ba52f193aa0ab657ea36e48968cd25eae6533f26
3	SIZE (osslsigncode-1.2.tar.gz) = 83752	3	SIZE (osslsigncode-1.3.tar.gz) = 573440




--- osslsigncode.c.orig	Fri Jan 21 04:23:44 2005
+++ osslsigncode.c	Thu Nov  9 15:31:37 2006
@@ -610,9 +610,10 @@
         
         BIO_write(hash, indata + i, st.st_size - i);
 
-	/* pad (with 0's) pe file to 8 byte boundary */
+	/* pad (with 0's) pe file to 8 byte boundary, but do not pad at all if 
+	   already aligned on 8 byte boundary. See http://sourceforge.net/tracker/index.php?func=detail&aid=1422627&group_id=129143&atid=713906 */
 	len = 8 - st.st_size % 8;
-	if (len > 0) {
+	if (len > 0 && len != 8) {
 	  memset(buf, 0, len);
 	  BIO_write(hash, buf, len);
 	  st.st_size += len;

Return to bug 120796

Removed Link Here

(-)files/patch-osslsigncode.c (-15 lines)
1	--- osslsigncode.c.orig Fri Jan 21 04:23:44 2005
2	+++ osslsigncode.c Thu Nov 9 15:31:37 2006
3	@@ -610,9 +610,10 @@
4
5	BIO_write(hash, indata + i, st.st_size - i);
6
7	- /* pad (with 0's) pe file to 8 byte boundary */
8	+ /* pad (with 0's) pe file to 8 byte boundary, but do not pad at all if
9	+ already aligned on 8 byte boundary. See http://sourceforge.net/tracker/index.php?func=detail&aid=1422627&group_id=129143&atid=713906 */
10	len = 8 - st.st_size % 8;
11	- if (len > 0) {
12	+ if (len > 0 && len != 8) {
13	memset(buf, 0, len);
14	BIO_write(hash, buf, len);
15	st.st_size += len;