diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.in | 34 | ||||
-rw-r--r-- | scard.c | 2 |
4 files changed, 41 insertions, 5 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20010918 | ||
2 | - (djm) Configure support for smartcards | ||
3 | |||
1 | 20010917 | 4 | 20010917 |
2 | - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds | 5 | - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds |
3 | - (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h] | 6 | - (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h] |
@@ -6457,4 +6460,4 @@ | |||
6457 | - Wrote replacements for strlcpy and mkdtemp | 6460 | - Wrote replacements for strlcpy and mkdtemp |
6458 | - Released 1.0pre1 | 6461 | - Released 1.0pre1 |
6459 | 6462 | ||
6460 | $Id: ChangeLog,v 1.1524 2001/09/17 21:34:33 tim Exp $ | 6463 | $Id: ChangeLog,v 1.1525 2001/09/18 04:01:11 djm Exp $ |
diff --git a/acconfig.h b/acconfig.h index 76eb3a9e9..2b2be91ab 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.115 2001/09/15 11:31:54 djm Exp $ */ | 1 | /* $Id: acconfig.h,v 1.116 2001/09/18 04:01:12 djm Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -333,6 +333,9 @@ | |||
333 | /* Define on *nto-qnx systems */ | 333 | /* Define on *nto-qnx systems */ |
334 | #undef MISSING_FD_MASK | 334 | #undef MISSING_FD_MASK |
335 | 335 | ||
336 | /* Define if you want smartcard support */ | ||
337 | #undef SMARTCARD | ||
338 | |||
336 | @BOTTOM@ | 339 | @BOTTOM@ |
337 | 340 | ||
338 | /* ******************* Shouldn't need to edit below this line ************** */ | 341 | /* ******************* Shouldn't need to edit below this line ************** */ |
diff --git a/configure.in b/configure.in index 30415d94a..d873054fa 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.309 2001/09/17 21:34:34 tim Exp $ | 1 | # $Id: configure.in,v 1.310 2001/09/18 04:01:12 djm Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -1311,12 +1311,41 @@ fi | |||
1311 | 1311 | ||
1312 | 1312 | ||
1313 | # Check whether user wants Kerberos support | 1313 | # Check whether user wants Kerberos support |
1314 | SCARD_MSG="no" | ||
1315 | AC_ARG_WITH(smartcard, | ||
1316 | [ --with-smartcard Enable smartcard support], | ||
1317 | [ | ||
1318 | if test "x$withval" != "xno" ; then | ||
1319 | if test "x$withval" != "xyes" ; then | ||
1320 | CPPFLAGS="$CPPFLAGS -I${withval}" | ||
1321 | LDFLAGS="$LDFLAGS -L${withval}" | ||
1322 | if test ! -z "$need_dash_r" ; then | ||
1323 | LDFLAGS="$LDFLAGS -R${withval}" | ||
1324 | fi | ||
1325 | if test ! -z "$blibpath" ; then | ||
1326 | blibpath="$blibpath:${withval}" | ||
1327 | fi | ||
1328 | fi | ||
1329 | AC_CHECK_HEADERS(sectok.h) | ||
1330 | if test "$ac_cv_header_sectok_h" != yes; then | ||
1331 | AC_MSG_ERROR(Can't find sectok.h) | ||
1332 | fi | ||
1333 | AC_CHECK_LIB(sectok, sectok_open) | ||
1334 | if test "$ac_cv_lib_sectok_sectok_open" != yes; then | ||
1335 | AC_MSG_ERROR(Can't find libsectok) | ||
1336 | fi | ||
1337 | AC_DEFINE(SMARTCARD) | ||
1338 | SCARD_MSG="yes" | ||
1339 | fi | ||
1340 | ] | ||
1341 | ) | ||
1342 | |||
1343 | # Check whether user wants Kerberos support | ||
1314 | KRB4_MSG="no" | 1344 | KRB4_MSG="no" |
1315 | AC_ARG_WITH(kerberos4, | 1345 | AC_ARG_WITH(kerberos4, |
1316 | [ --with-kerberos4=PATH Enable Kerberos 4 support], | 1346 | [ --with-kerberos4=PATH Enable Kerberos 4 support], |
1317 | [ | 1347 | [ |
1318 | if test "x$withval" != "xno" ; then | 1348 | if test "x$withval" != "xno" ; then |
1319 | |||
1320 | if test "x$withval" != "xyes" ; then | 1349 | if test "x$withval" != "xyes" ; then |
1321 | CPPFLAGS="$CPPFLAGS -I${withval}/include" | 1350 | CPPFLAGS="$CPPFLAGS -I${withval}/include" |
1322 | LDFLAGS="$LDFLAGS -L${withval}/lib" | 1351 | LDFLAGS="$LDFLAGS -L${withval}/lib" |
@@ -2069,6 +2098,7 @@ echo " Random number collection: $RAND_MSG" | |||
2069 | echo " Manpage format: $MANTYPE" | 2098 | echo " Manpage format: $MANTYPE" |
2070 | echo " PAM support: ${PAM_MSG}" | 2099 | echo " PAM support: ${PAM_MSG}" |
2071 | echo " KerberosIV support: $KRB4_MSG" | 2100 | echo " KerberosIV support: $KRB4_MSG" |
2101 | echo " Smartcard support: $SCARD_MSG" | ||
2072 | echo " AFS support: $AFS_MSG" | 2102 | echo " AFS support: $AFS_MSG" |
2073 | echo " S/KEY support: $SKEY_MSG" | 2103 | echo " S/KEY support: $SKEY_MSG" |
2074 | echo " TCP Wrappers support: $TCPW_MSG" | 2104 | echo " TCP Wrappers support: $TCPW_MSG" |
@@ -22,8 +22,8 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #ifdef SMARTCARD | ||
26 | #include "includes.h" | 25 | #include "includes.h" |
26 | #ifdef SMARTCARD | ||
27 | RCSID("$OpenBSD: scard.c,v 1.13 2001/08/02 16:14:05 jakob Exp $"); | 27 | RCSID("$OpenBSD: scard.c,v 1.13 2001/08/02 16:14:05 jakob Exp $"); |
28 | 28 | ||
29 | #include <openssl/engine.h> | 29 | #include <openssl/engine.h> |