Attachment 1558 Details for Bug 1371 – 4000_possh_pkcs11.patch

[patch] 4000_possh_pkcs11.patch

4000_possh_pkcs11.patch (text/plain), 2.34 KB, created by Alon Bar-Lev on 2008-08-09 19:16:45 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Bar-Lev

Created: 2008-08-09 19:16:45 AEST

Size: 2.34 KB

patch

obsolete

>[PATCH] Portable OpenSSH PKCS#11 Additions
>
>Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
>
>---
>
>--- openssh-4.7p1/pkcs11.c	2008-01-08 12:25:25.000000000 +0200
>+++ openssh-4.7p1+pkcs11-0.21/pkcs11.c	2008-01-08 12:25:49.000000000 +0200
>@@ -27,6 +27,8 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>+#include "includes.h"
>+
> #ifdef ENABLE_PKCS11
> 
> #include <string.h>
>diff -urNp openssh-4.7p1/configure.ac openssh-4.7p1+pkcs11-0.21/configure.ac
>--- openssh-4.7p1/configure.ac	2007-08-10 07:36:12.000000000 +0300
>+++ openssh-4.7p1+pkcs11-0.21/configure.ac	2007-12-29 23:59:41.000000000 +0200
>@@ -3141,6 +3141,24 @@ AC_ARG_WITH(opensc,
> 	]
> )
> 
>+PKCS11_MSG="no"
>+ssh_pkcs11="no"
>+AC_ARG_WITH(pkcs11,
>+	[  --with-pkcs11           Enable smartcard support using PKCS11],
>+	[
>+		if test "x$withval" != "xno" ; then
>+			AC_CHECK_HEADER([pkcs11-helper-1.0/pkcs11h-core.h], ,
>+			    AC_MSG_ERROR(PKCS11 support requires pkcs11-helper headers))
>+			AC_CHECK_LIB(pkcs11-helper, pkcs11h_initialize,
>+				[LIBS="${LIBS} -lpkcs11-helper"],
>+				AC_MSG_ERROR([PKCS11 support requires pkcs11-helper]))
>+			AC_DEFINE(ENABLE_PKCS11, 1, [Define if you want smartcard support using PKCS11])
>+			PKCS11_MSG="yes"
>+			ssh_pkcs11="yes"
>+		fi
>+	]
>+)
>+
> # Check libraries needed by DNS fingerprint support
> AC_SEARCH_LIBS(getrrsetbyname, resolv,
> 	[AC_DEFINE(HAVE_GETRRSETBYNAME, 1,
>@@ -4039,6 +4058,7 @@ echo "       IP address in \$DISPLAY hac
> echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
> echo "                  BSD Auth support: $BSD_AUTH_MSG"
> echo "              Random number source: $RAND_MSG"
>+echo "                   PKCS#11 support: $PKCS11_MSG"
> if test ! -z "$USE_RAND_HELPER" ; then
> echo "     ssh-rand-helper collects from: $RAND_HELPER_MSG"
> fi
>diff -urNp openssh-4.7p1/Makefile.in openssh-4.7p1+pkcs11-0.21/Makefile.in
>--- openssh-4.7p1/Makefile.in	2007-06-11 07:01:42.000000000 +0300
>+++ openssh-4.7p1+pkcs11-0.21/Makefile.in	2007-12-29 23:59:41.000000000 +0200
>@@ -64,6 +64,7 @@ TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-a
> 
> LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
> 	canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
>+	pkcs11.o \
> 	cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
> 	compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
> 	log.o match.o md-sha256.o moduli.o nchan.o packet.o \

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