From 46c8e0f66cf947f0810ff4d2a99fd47dd743e383 Mon Sep 17 00:00:00 2001
From: mouring <mouring>
Date: Mon, 8 Apr 2002 18:37:07 +0000
Subject: [PATCH] =?utf8?q?=20-=20(bal)=20Minor=20OpenSC=20updates.=20=20Fi?=
 =?utf8?q?x=20up=20header=20locations=20and=20update=20=20=20=20README.sma?=
 =?utf8?q?rtcard=20provided=20by=20Juha=20Yrj=F6l=E4=20<jyrjola@cc.hut.fi>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ChangeLog        | 4 ++++
 README.smartcard | 5 +++--
 configure.ac     | 4 ++--
 scard-opensc.c   | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35673792..ed5a6d36 100644
--- 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 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 2f35b93c..4e62cce6 100644
--- 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 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"
-- 
2.45.2