Attachment #1558 for bug #1371

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

and this patch

Lines 27-32 Link Here

(-)openssh-4.7p1/pkcs11.c (+2 lines)
27	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	27	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	*/	28	*/
29		29
		30	#include "includes.h"
		31
30	#ifdef ENABLE_PKCS11	32	#ifdef ENABLE_PKCS11
31		33
32	#include <string.h>	34	#include <string.h>




	]
)

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,

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

Lines 64-69 TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-a Link Here

(-)openssh-4.7p1/Makefile.in (+1 lines)
64		64
65	LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \	65	LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
66	canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \	66	canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
		67	pkcs11.o \
67	cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \	68	cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
68	compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \	69	compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
69	log.o match.o md-sha256.o moduli.o nchan.o packet.o \	70	log.o match.o md-sha256.o moduli.o nchan.o packet.o \

Return to bug 1371

Lines 3141-3146 AC_ARG_WITH(opensc, Link Here

(-)openssh-4.7p1/configure.ac (+19 lines)
3141	]	3141	]
3142	)	3142	)
3143		3143
		3144	PKCS11_MSG="no"
		3145	ssh_pkcs11="no"
		3146	AC_ARG_WITH(pkcs11,
		3147	[ --with-pkcs11 Enable smartcard support using PKCS11],
		3148	[
		3149	if test "x$withval" != "xno" ; then
		3150	AC_CHECK_HEADER([pkcs11-helper-1.0/pkcs11h-core.h], ,
		3151	AC_MSG_ERROR(PKCS11 support requires pkcs11-helper headers))
		3152	AC_CHECK_LIB(pkcs11-helper, pkcs11h_initialize,
		3153	[LIBS="${LIBS} -lpkcs11-helper"],
		3154	AC_MSG_ERROR([PKCS11 support requires pkcs11-helper]))
		3155	AC_DEFINE(ENABLE_PKCS11, 1, [Define if you want smartcard support using PKCS11])
		3156	PKCS11_MSG="yes"
		3157	ssh_pkcs11="yes"
		3158	fi
		3159	]
		3160	)
		3161
3144	# Check libraries needed by DNS fingerprint support	3162	# Check libraries needed by DNS fingerprint support
3145	AC_SEARCH_LIBS(getrrsetbyname, resolv,	3163	AC_SEARCH_LIBS(getrrsetbyname, resolv,
3146	[AC_DEFINE(HAVE_GETRRSETBYNAME, 1,	3164	[AC_DEFINE(HAVE_GETRRSETBYNAME, 1,
Lines 4039-4044 echo " IP address in \$DISPLAY hac Link Here
4039	echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"	4058	echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
4040	echo " BSD Auth support: $BSD_AUTH_MSG"	4059	echo " BSD Auth support: $BSD_AUTH_MSG"
4041	echo " Random number source: $RAND_MSG"	4060	echo " Random number source: $RAND_MSG"
		4061	echo " PKCS#11 support: $PKCS11_MSG"
4042	if test ! -z "$USE_RAND_HELPER" ; then	4062	if test ! -z "$USE_RAND_HELPER" ; then
4043	echo " ssh-rand-helper collects from: $RAND_HELPER_MSG"	4063	echo " ssh-rand-helper collects from: $RAND_HELPER_MSG"
4044	fi	4064	fi