Attachment #1469 for bug #1371

View | Details | Raw Unified | Return to bug 1371 | Differences between

and this patch

Lines 9-14 SRCS= authfd.c authfile.c bufaux.c bufbn Link Here

(-)ssh.org/lib/Makefile (+1 lines)
9	cleanup.c compat.c compress.c crc32.c deattack.c fatal.c \	9	cleanup.c compat.c compress.c crc32.c deattack.c fatal.c \
10	hostfile.c log.c match.c nchan.c packet.c readpass.c \	10	hostfile.c log.c match.c nchan.c packet.c readpass.c \
11	rsa.c ttymodes.c xmalloc.c atomicio.c \	11	rsa.c ttymodes.c xmalloc.c atomicio.c \
		12	pkcs11.c \
12	key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \	13	key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
13	ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \	14	ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
14	kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \	15	kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \

Lines 18-23 CDIAGFLAGS+= -Wshadow Link Here

(-)ssh.org/Makefile.inc (+6 lines)
18	#CFLAGS+= -DSMARTCARD	18	#CFLAGS+= -DSMARTCARD
19	#LDADD+= -lsectok	19	#LDADD+= -lsectok
20		20
		21	PKCS11?= no
		22	.if (${PKCS11:L} == "yes")
		23	CFLAGS+= -DENABLE_PKCS11
		24	LIBPKCS11_HELPER?=${DESTDIR}/usr/lib/libpkcs11-helper.a
		25	.endif # PKCS11
		26
21	.include <bsd.obj.mk>	27	.include <bsd.obj.mk>
22		28
23	.if exists(${.CURDIR}/../lib/${__objdir})	29	.if exists(${.CURDIR}/../lib/${__objdir})

Lines 28-32 DPADD+= ${LIBGSSAPI} ${LIBKRB5} Link Here

(-)ssh.org/ssh/Makefile (+5 lines)
28	LDADD+= -lgssapi -lkrb5	28	LDADD+= -lgssapi -lkrb5
29	.endif # KERBEROS5	29	.endif # KERBEROS5
30		30
		31	.if (${PKCS11:L} == "yes")
		32	DPADD+= ${LIBPKCS11_HELPER}
		33	LDADD+= -lpkcs11-helper
		34	.endif # PKCS11
		35
31	DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBDES}	36	DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBDES}
32	LDADD+= -lcrypto -lz -ldes	37	LDADD+= -lcrypto -lz -ldes

Lines 14-18 SRCS= ssh-add.c Link Here

(-)ssh.org/ssh-add/Makefile (+5 lines)
14		14
15	.include <bsd.prog.mk>	15	.include <bsd.prog.mk>
16		16
		17	.if (${PKCS11:L} == "yes")
		18	DPADD+= ${LIBPKCS11_HELPER}
		19	LDADD+= -lpkcs11-helper
		20	.endif # PKCS11
		21
17	LDADD+= -lcrypto	22	LDADD+= -lcrypto
18	DPADD+= ${LIBCRYPTO}	23	DPADD+= ${LIBCRYPTO}

Lines 15-19 SRCS= ssh-agent.c Link Here

(-)ssh.org/ssh-agent/Makefile (+5 lines)
15		15
16	.include <bsd.prog.mk>	16	.include <bsd.prog.mk>
17		17
		18	.if (${PKCS11:L} == "yes")
		19	DPADD+= ${LIBPKCS11_HELPER}
		20	LDADD+= -lpkcs11-helper
		21	.endif # PKCS11
		22
18	LDADD+= -lcrypto	23	LDADD+= -lcrypto
19	DPADD+= ${LIBCRYPTO}	24	DPADD+= ${LIBCRYPTO}

Lines 14-18 SRCS= ssh-keygen.c moduli.c Link Here

(-)ssh.org/ssh-keygen/Makefile (+5 lines)
14		14
15	.include <bsd.prog.mk>	15	.include <bsd.prog.mk>
16		16
		17	.if (${PKCS11:L} == "yes")
		18	DPADD+= ${LIBPKCS11_HELPER}
		19	LDADD+= -lpkcs11-helper
		20	.endif # PKCS11
		21
17	LDADD+= -lcrypto	22	LDADD+= -lcrypto
18	DPADD+= ${LIBCRYPTO}	23	DPADD+= ${LIBCRYPTO}

Return to bug 1371