patch-against-cvs.diff

linux下的专门用于处理PKCS11的c++库和源代码 非常好用

diff -ruNx CVS openssh_cvs/Makefile.in openssh_my/Makefile.in
--- openssh_cvs/Makefile.in	Mon Nov 12 01:34:23 2001
+++ openssh_my/Makefile.in	Wed Nov 21 14:04:50 2001
@@ -46,7 +46,7 @@
 
 TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP_PROGS)
 
-LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o mac.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o 
+LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o mac.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o scard-libsc.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o 
 
 SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clientloop.o
 
diff -ruNx CVS openssh_cvs/acconfig.h openssh_my/acconfig.h
--- openssh_cvs/acconfig.h	Sat Nov  3 21:09:33 2001
+++ openssh_my/acconfig.h	Wed Nov 21 14:15:55 2001
@@ -329,6 +329,9 @@
 /* Define if you want smartcard support */
 #undef SMARTCARD
 
+/* Define if you want libsc support */
+#undef LIBSC
+
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */
diff -ruNx CVS openssh_cvs/configure.ac openssh_my/configure.ac
--- openssh_cvs/configure.ac	Sat Nov  3 21:09:33 2001
+++ openssh_my/configure.ac	Wed Nov 21 14:00:06 2001
@@ -1413,7 +1413,7 @@
 fi
 
 
-# Check whether user wants Kerberos support
+# Check whether user wants smart card support
 SCARD_MSG="no" 
 AC_ARG_WITH(smartcard,
 	[  --with-smartcard        Enable smartcard support],
@@ -1438,6 +1438,37 @@
 				AC_MSG_ERROR(Can't find libsectok)
 			fi
 			AC_DEFINE(SMARTCARD)
+			SCARD_MSG="yes" 
+		fi
+	]
+)
+
+# Check whether user wants libsc support
+SCARD_MSG="no" 
+AC_ARG_WITH(libsc,
+	[  --with-libsc            Enable libsc support],
+	[
+		if test "x$withval" != "xno" ; then
+			if test "x$withval" != "xyes" ; then
+				CPPFLAGS="$CPPFLAGS -I${withval}"
+				LDFLAGS="$LDFLAGS -L${withval}"
+				if test ! -z "$need_dash_r" ; then
+					LDFLAGS="$LDFLAGS -R${withval}"
+				fi
+				if test ! -z "$blibpath" ; then
+					blibpath="$blibpath:${withval}"
+				fi
+			fi
+			AC_CHECK_HEADERS(sc-pkcs15.h)
+			if test "$ac_cv_header_sc_pkcs15_h" != yes; then
+				AC_MSG_ERROR(Can't find sc-pkcs15.h)
+			fi
+			AC_CHECK_LIB(sc, sc_pkcs15_init)
+			if test "$ac_cv_lib_sc_sc_pkcs15_init" != yes; then
+				AC_MSG_ERROR(Can't find libsc)
+			fi
+			AC_DEFINE(SMARTCARD)
+			AC_DEFINE(LIBSC)
 			SCARD_MSG="yes" 
 		fi
 	]
diff -ruNx CVS openssh_cvs/scard-libsc.c openssh_my/scard-libsc.c
--- openssh_cvs/scard-libsc.c	Thu Jan  1 02:00:00 1970
+++ openssh_my/scard-libsc.c	Wed Nov 21 22:26:36 2001
@@ -0,0 +1,363 @@
+/* libsc support in OpenSSH -- heavily modified from scard.c
+ * 
+ * Copyright (c) 2001 Juha Yrj鰈