diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | README.smartcard | 5 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | scard-opensc.c | 4 |
4 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,7 @@ +20020408 + - (bal) Minor OpenSC updates. Fix up header locations and update + README.smartcard provided by Juha Yrjölä <jyrjola@cc.hut.fi> + 20020407 - (stevesk) HAVE_CONTROL_IN_MSGHDR; not used right now. Future: we may want to test if fd passing works correctly. @@ -8199,4 +8203,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2039 2002/04/07 22:36:49 stevesk Exp $ +$Id: ChangeLog,v 1.2040 2002/04/08 18:37:07 mouring Exp $ diff --git a/README.smartcard b/README.smartcard index 17bbde72..3017452c 100644 --- a/README.smartcard +++ b/README.smartcard @@ -1,14 +1,15 @@ How to use smartcards with OpenSSH? OpenSSH contains experimental support for authentication using -Cyberflex smartcards and TODOS card readers. +Cyberflex smartcards and TODOS card readers, in addition to the cards with +PKCS #15 structure supported by OpenSC. WARNING: Smartcard support is still in development. Keyfile formats, etc are still subject to change. To enable this you need to: -(1) install sectok or openSC +(1) install sectok or OpenSC Sources are instructions are available from http://www.citi.umich.edu/projects/smartcard/sectok.html diff --git a/configure.ac b/configure.ac index d3c94bc0..93d21bfa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.40 2002/04/07 19:44:14 stevesk Exp $ +# $Id: configure.ac,v 1.41 2002/04/08 18:37:09 mouring Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -1730,9 +1730,9 @@ AC_ARG_WITH(opensc, blibpath="$blibpath:${withval}" fi fi - AC_CHECK_HEADERS(opensc-pkcs15.h) + AC_CHECK_HEADERS(opensc/pkcs15.h) if test "$ac_cv_header_opensc_pkcs15_h" != yes; then - AC_MSG_ERROR(Can't find opensc-pkcs15.h) + AC_MSG_ERROR(Can't find opensc/pkcs15.h) fi AC_CHECK_LIB(opensc, sc_pkcs15_bind) if test "$ac_cv_lib_opensc_sc_pkcs15_bind" != yes; then diff --git a/scard-opensc.c b/scard-opensc.c index ff59b29c..6b80d1e6 100644 --- a/scard-opensc.c +++ b/scard-opensc.c @@ -29,8 +29,8 @@ #include <openssl/evp.h> #include <openssl/x509.h> -#include <opensc.h> -#include <opensc-pkcs15.h> +#include <opensc/opensc.h> +#include <opensc/pkcs15.h> #include "key.h" #include "log.h" |