- (bal) Minor OpenSC updates. Fix up header locations and update

   README.smartcard provided by Juha Yrjölä <jyrjola@cc.hut.fi>

diff --git a/ChangeLog b/ChangeLog
index 35673792edd3403667f9f1f5c8cc307d1da03fbe..ed5a6d36c73c6c0f52cc73bf485172eb3f6508cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/README.smartcard b/README.smartcard
index 17bbde7210c24752024eb2a9ad44f4150a8a6969..3017452c4943c078acfaf6d2c2c2d894b5e9133f 100644 (file)
--- 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 2f35b93cd3fab37e77bcfaa65dff8f9e35cab261..4e62cce63502f22bd223aca4fc07ec5a8447ea8b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 ff59b29c49d15afcebe49c9144fc5183a7174618..6b80d1e6840dcd4832d313998a1926e681210882 100644 (file)
--- 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"