Attachment 1469 Details for Bug 1371 – 3000_ossh_pkcs11.patch

[patch] 3000_ossh_pkcs11.patch

3000_ossh_pkcs11.patch (text/plain), 2.71 KB, created by Alon Bar-Lev on 2008-03-07 19:43:06 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Bar-Lev

Created: 2008-03-07 19:43:06 AEDT

Size: 2.71 KB

patch

obsolete

>[PATCH] OpenSSH PKCS#11 Additions
>
>Set up for:
>make PKCS11=yes
>
>Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
>
>---
>
>diff -urNp ssh.org/lib/Makefile ssh/lib/Makefile
>--- ssh.org/lib/Makefile	2007-06-07 22:37:34.000000000 +0300
>+++ ssh/lib/Makefile	2008-01-08 14:36:30.000000000 +0200
>@@ -9,6 +9,7 @@ SRCS=	authfd.c authfile.c bufaux.c bufbn
> 	cleanup.c compat.c compress.c crc32.c deattack.c fatal.c \
> 	hostfile.c log.c match.c nchan.c packet.c readpass.c \
> 	rsa.c ttymodes.c xmalloc.c atomicio.c \
>+	pkcs11.c \
> 	key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
> 	ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
> 	kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
>diff -urNp ssh.org/Makefile.inc ssh/Makefile.inc
>--- ssh.org/Makefile.inc	2005-06-17 05:45:19.000000000 +0300
>+++ ssh/Makefile.inc	2008-01-08 14:37:19.000000000 +0200
>@@ -18,6 +18,12 @@ CDIAGFLAGS+=	-Wshadow
> #CFLAGS+=	-DSMARTCARD
> #LDADD+=	-lsectok
> 
>+PKCS11?=	no
>+.if (${PKCS11:L} == "yes")
>+CFLAGS+=	-DENABLE_PKCS11
>+LIBPKCS11_HELPER?=${DESTDIR}/usr/lib/libpkcs11-helper.a
>+.endif # PKCS11
>+
> .include <bsd.obj.mk>
> 
> .if exists(${.CURDIR}/../lib/${__objdir})
>diff -urNp ssh.org/ssh/Makefile ssh/ssh/Makefile
>--- ssh.org/ssh/Makefile	2003-11-21 13:57:03.000000000 +0200
>+++ ssh/ssh/Makefile	2008-01-08 14:37:42.000000000 +0200
>@@ -28,5 +28,10 @@ DPADD+=  ${LIBGSSAPI} ${LIBKRB5}
> LDADD+=  -lgssapi -lkrb5
> .endif # KERBEROS5
> 
>+.if (${PKCS11:L} == "yes")
>+DPADD+= ${LIBPKCS11_HELPER}
>+LDADD+= -lpkcs11-helper
>+.endif # PKCS11
>+
> DPADD+=	${LIBCRYPTO} ${LIBZ} ${LIBDES}
> LDADD+=	-lcrypto -lz -ldes
>diff -urNp ssh.org/ssh-add/Makefile ssh/ssh-add/Makefile
>--- ssh.org/ssh-add/Makefile	2001-03-04 02:51:25.000000000 +0200
>+++ ssh/ssh-add/Makefile	2008-01-08 14:38:40.000000000 +0200
>@@ -14,5 +14,10 @@ SRCS=	ssh-add.c
> 
> .include <bsd.prog.mk>
> 
>+.if (${PKCS11:L} == "yes")
>+DPADD+= ${LIBPKCS11_HELPER}
>+LDADD+= -lpkcs11-helper
>+.endif # PKCS11
>+
> LDADD+=	-lcrypto
> DPADD+= ${LIBCRYPTO}
>diff -urNp ssh.org/ssh-agent/Makefile ssh/ssh-agent/Makefile
>--- ssh.org/ssh-agent/Makefile	2002-08-12 13:46:35.000000000 +0300
>+++ ssh/ssh-agent/Makefile	2008-01-08 14:37:53.000000000 +0200
>@@ -15,5 +15,10 @@ SRCS=	ssh-agent.c
> 
> .include <bsd.prog.mk>
> 
>+.if (${PKCS11:L} == "yes")
>+DPADD+= ${LIBPKCS11_HELPER}
>+LDADD+= -lpkcs11-helper
>+.endif # PKCS11
>+
> LDADD+=	-lcrypto
> DPADD+=	${LIBCRYPTO}
>diff -urNp ssh.org/ssh-keygen/Makefile ssh/ssh-keygen/Makefile
>--- ssh.org/ssh-keygen/Makefile	2003-07-28 12:49:56.000000000 +0300
>+++ ssh/ssh-keygen/Makefile	2008-01-08 14:38:16.000000000 +0200
>@@ -14,5 +14,10 @@ SRCS=	ssh-keygen.c moduli.c
> 
> .include <bsd.prog.mk>
> 
>+.if (${PKCS11:L} == "yes")
>+DPADD+= ${LIBPKCS11_HELPER}
>+LDADD+= -lpkcs11-helper
>+.endif # PKCS11
>+
> LDADD+=	-lcrypto
> DPADD+=	${LIBCRYPTO}

Actions: View | Diff

Attachments on bug 1371: 1444 | 1463 | 1464 | 1465 | 1466 | 1467 | 1468 | 1469 | 1470 | 1471 | 1477 | 1478 | 1484 | 1485 | 1486 | 1487 | 1488 | 1489 | 1490 | 1491 | 1492 | 1493 | 1494 | 1495 | 1496 | 1497 | 1547 | 1557 | 1558