Attachment #201663 for bug #235444

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




# $FreeBSD$

PORTNAME=	sha1collisiondetection
PORTVERSION=	1.0.3
DISTVERSIONPREFIX=	stable-v
CATEGORIES=	security


		bin/sha1dcsum_partialcoll \
		include/sha1dc/sha1.h \
		lib/libsha1detectcoll.so \
		lib/libsha1detectcoll.so.1 \
		lib/libsha1detectcoll.so.1.0.0
do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/sha1dcsum* ${STAGEDIR}${PREFIX}/bin
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/sha1dc
	${INSTALL_DATA} ${WRKSRC}/lib/sha1.h ${STAGEDIR}${PREFIX}/include/sha1dc
	${INSTALL_LIB} ${WRKSRC}/bin/.libs/libsha1detectcoll.so.1.0.0 ${STAGEDIR}${PREFIX}/lib
	${LN} -sf libsha1detectcoll.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so
	${LN} -sf libsha1detectcoll.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so.1

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1489459273	1	TIMESTAMP = 1549146242
2	SHA256 (cr-marcstevens-sha1collisiondetection-stable-v1.0.2_GH0.tar.gz) = ab1a5624d12417b5af9ffe6662546b6932c39c0e4c4bef822851a2d0e53df790	2	SHA256 (cr-marcstevens-sha1collisiondetection-stable-v1.0.3_GH0.tar.gz) = 77a1c2b2a4fbe4f78de288fa4831ca63938c3cb84a73a92c79f436238bd9ac07
3	SIZE (cr-marcstevens-sha1collisiondetection-stable-v1.0.2_GH0.tar.gz) = 778302	3	SIZE (cr-marcstevens-sha1collisiondetection-stable-v1.0.3_GH0.tar.gz) = 780306




diff -u Makefile Makefile
--- Makefile	2017-03-27 12:11:23.000000000 -0400
+++ Makefile	2019-02-02 19:04:55.614733000 -0400
@@ -33,7 +33,7 @@
 endif
 
 
-CFLAGS=-O2 -Wall -Werror -Wextra -pedantic -std=c90 -Ilib
+CFLAGS=-O2 -Wall -Werror -Wextra -pedantic -Ilib
 LDFLAGS=
 
 LT_CC:=$(LIBTOOL) --tag=CC --mode=compile $(CC)




diff -u src/main.c src/main.c
--- src/main.c	2017-03-27 12:11:23.000000000 -0400
+++ src/main.c	2019-02-02 19:07:36.596835000 -0400
@@ -9,6 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libgen.h>
+#include <limits.h>	/* for NAME_MAX, max bytes in a file name */
+#include <assert.h>	/* for assert() macro */
 
 #include "sha1.h"
 
@@ -23,7 +25,9 @@
 
 	if (argc < 2)
 	{
-		printf("Usage: %s <file>\n", basename(argv[0]));
+assert (sizeof(buffer) >= NAME_MAX); /* reuse buffer[] for newly-POSIX-compliant, thread-safe basename() */
+		(void) strlcpy (buffer, argv[0], sizeof (buffer));
+		printf("Usage: %s <file>\n", basename(buffer));
 		return 1;
 	}
 

Return to bug 235444

Lines 1-7 Link Here

(-)Makefile (-6 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= sha1collisiondetection	3	PORTNAME= sha1collisiondetection
4	PORTVERSION= 1.0.2	4	PORTVERSION= 1.0.3
5	DISTVERSIONPREFIX= stable-v	5	DISTVERSIONPREFIX= stable-v
6	CATEGORIES= security	6	CATEGORIES= security
7		7
Lines 28-41 Link Here
28	bin/sha1dcsum_partialcoll \	28	bin/sha1dcsum_partialcoll \
29	include/sha1dc/sha1.h \	29	include/sha1dc/sha1.h \
30	lib/libsha1detectcoll.so \	30	lib/libsha1detectcoll.so \
31	lib/libsha1detectcoll.so.0 \	31	lib/libsha1detectcoll.so.1 \
32	lib/libsha1detectcoll.so.0.0.0	32	lib/libsha1detectcoll.so.1.0.0
33	do-install:	33	do-install:
34	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/sha1dcsum* ${STAGEDIR}${PREFIX}/bin	34	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/sha1dcsum* ${STAGEDIR}${PREFIX}/bin
35	@${MKDIR} ${STAGEDIR}${PREFIX}/include/sha1dc	35	@${MKDIR} ${STAGEDIR}${PREFIX}/include/sha1dc
36	${INSTALL_DATA} ${WRKSRC}/lib/sha1.h ${STAGEDIR}${PREFIX}/include/sha1dc	36	${INSTALL_DATA} ${WRKSRC}/lib/sha1.h ${STAGEDIR}${PREFIX}/include/sha1dc
37	${INSTALL_LIB} ${WRKSRC}/bin/.libs/libsha1detectcoll.so.0.0.0 ${STAGEDIR}${PREFIX}/lib	37	${INSTALL_LIB} ${WRKSRC}/bin/.libs/libsha1detectcoll.so.1.0.0 ${STAGEDIR}${PREFIX}/lib
38	${LN} -sf libsha1detectcoll.so.0.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so	38	${LN} -sf libsha1detectcoll.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so
39	${LN} -sf libsha1detectcoll.so.0.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so.0	39	${LN} -sf libsha1detectcoll.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libsha1detectcoll.so.1
40		40
41	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Added Link Here

(-)files/patch-Makefile (+12 lines)
1	diff -u Makefile Makefile
2	--- Makefile 2017-03-27 12:11:23.000000000 -0400
3	+++ Makefile 2019-02-02 19:04:55.614733000 -0400
4	@@ -33,7 +33,7 @@
5	endif
6
7
8	-CFLAGS=-O2 -Wall -Werror -Wextra -pedantic -std=c90 -Ilib
9	+CFLAGS=-O2 -Wall -Werror -Wextra -pedantic -Ilib
10	LDFLAGS=
11
12	LT_CC:=$(LIBTOOL) --tag=CC --mode=compile $(CC)

Added Link Here

(-)files/patch-src::main.c (+23 lines)
1	diff -u src/main.c src/main.c
2	--- src/main.c 2017-03-27 12:11:23.000000000 -0400
3	+++ src/main.c 2019-02-02 19:07:36.596835000 -0400
4	@@ -9,6 +9,8 @@
5	#include <stdlib.h>
6	#include <string.h>
7	#include <libgen.h>
8	+#include <limits.h> /* for NAME_MAX, max bytes in a file name */
9	+#include <assert.h> /* for assert() macro */
10
11	#include "sha1.h"
12
13	@@ -23,7 +25,9 @@
14
15	if (argc < 2)
16	{
17	- printf("Usage: %s <file>\n", basename(argv[0]));
18	+assert (sizeof(buffer) >= NAME_MAX); /* reuse buffer[] for newly-POSIX-compliant, thread-safe basename() */
19	+ (void) strlcpy (buffer, argv[0], sizeof (buffer));
20	+ printf("Usage: %s <file>\n", basename(buffer));
21	return 1;
22	}
23