Changeset 40

Timestamp:

01/31/06 17:13:31 (3 years ago)

Author:

martin

Message:

• Use opensc.conf from OpenSC to get the score configuration and get rid of OpenSCConfig
• Find the right reader to use
• Update to latest Tokend code (10.4.4)

Location:

trunk/opensc.tokend/Tokend-11

Files:

• OpenSC/OpenSCConfig.cpp (deleted)
• OpenSC/OpenSCConfig.h (deleted)
• OpenSC/OpenSCKeyHandle.cpp (modified) (1 diff)
• OpenSC/OpenSCToken.cpp (modified) (12 diffs)
• OpenSC/OpenSCToken.h (modified) (2 diffs)
• Tokend.xcodeproj/project.pbxproj (modified) (9 diffs)

trunk/opensc.tokend/Tokend-11/OpenSC/OpenSCKeyHandle.cpp

@@ -247 +247 @@
         return new OpenSCKeyHandle(openSCToken, metaRecord, key);
 }
-
-/* arch-tag: 8B1B6D68-124C-11D9-B5E6-000A9595DEEE */

trunk/opensc.tokend/Tokend-11/OpenSC/OpenSCToken.cpp

@@ -27 +27 @@
 #include "AttributeCoder.h"
 
-#include "opensc/opensc.h"
-
+#include <opensc/opensc.h>
+#include <opensc/scconf.h>
 #include "OpenSCError.h"
 #include "OpenSCRecord.h"
@@ -41 +41 @@
 OpenSCToken::OpenSCToken() : mLocked(false)
 {
-        //otdEnableLogging(true);
+        otdEnableLogging(true);
         mTokenContext = this;
         mScCtx = NULL;
@@ -76 +76 @@
         const unsigned char *newPin, size_t newPinLength)
 {
-        otdLog("In OpenSCToken::changePIN()\n");
+        otdLog("In OpenSCToken::changePIN(%d)\n", pinNum);
+        int r;
         if (pinNum != 1)
                 CssmError::throwMe(CSSM_ERRCODE_SAMPLE_VALUE_NOT_SUPPORTED);
-
+        
         if (oldPinLength < 0 || oldPinLength > 14 ||
                 newPinLength < 0 || newPinLength > 14)
                 CssmError::throwMe(CSSM_ERRCODE_INVALID_SAMPLE_VALUE);
+        
 }
 
@@ -101 +103 @@
 void OpenSCToken::verifyPIN(int pinNum, const uint8_t *pin, size_t pinLength)
 {
-        otdLog("In OpenSCToken::verifyPIN()\n");
+        otdLog("In OpenSCToken::verifyPIN(%d)\n", pinNum);
         if (_verifyPIN(pinNum, pin, pinLength)) {
                 otdLog("  About to call BEGIN()\n");
-                mLocked = true;
+                mLocked = false;
         } else {
                 CssmError::throwMe(CSSM_ERRCODE_OPERATION_AUTH_DENIED);
@@ -194 +196 @@
                 CssmError::throwMe(CSSM_ERRCODE_SAMPLE_VALUE_NOT_SUPPORTED);
         
-        mLocked = false;
+        mLocked = true;
 }
 
@@ -204 +206 @@
 {
         otdLog("\nIn OpenSCToken::probe()\n");
-
+        
         uint32 score = Tokend::ISO7816Token::probe(flags, tokenUid);
 
-        bool doDisconnect = true; /*!(flags & kSecTokendProbeKeepToken); */
+        // FIXME bool doDisconnect = true; /*!(flags & kSecTokendProbeKeepToken); */
 
         // Init OpenSC
-        int r = sc_establish_context(&mScCtx, "default");
+        int r = sc_establish_context(&mScCtx, "tokend");
         otdLog("  tokend_establish_context(): %d\n", r);
         if (r == 0) {
@@ -217 +219 @@
                 const SCARD_READERSTATE &readerState = *(*startupReaderInfo)();
                 for (idx = 0; idx < mScCtx->reader_count; idx++) {
-                        if (strcmp(readerState.szReader, mScCtx->reader[0]->name) == 0)
+                        if (strcmp(readerState.szReader, mScCtx->reader[idx]->name) == 0)
                                 break;
                 }
@@ -223 +225 @@
                 // Connect to the card
                 if (idx < mScCtx->reader_count) {
-                        r = sc_connect_card(mScCtx->reader[0], 0, &mScCard);
+                        r = sc_connect_card(mScCtx->reader[idx], 0, &mScCard);
                         otdLog("  sc_connect_card(): %d\n", r);
                         if (r < 0) {
                                 sc_release_context(mScCtx);
                                 mScCtx = NULL;
-                        }
-                        else {
+                        } else {
                                 otdLog("  card: %s\n", mScCard->name);
                                 r = sc_pkcs15_bind(mScCard, &mScP15Card);
                                 otdLog("  sc_pkcs15_bind(): %d\n", r);
                                 if (r == 0) {
-                                        // OK, the we can handle the card
-                                        doDisconnect = false;
-
-                                        // Get a score for this card
-                                        score = mConfig.getScore(mScP15Card);
-
+                                        // get the score
+                                        scconf_block *conf_block = NULL;
+                                        conf_block = sc_get_conf_block(mScCtx, "framework", "tokend", 1);
+                                        if (conf_block) {
+                                                score = scconf_get_int(conf_block, "score", 50);
+                                        } else {
+                                                score = 50;
+                                        }
+                                        
                                         // Create a tokenUid
                                         if (mScP15Card->label != NULL)
@@ -254 +258 @@
                         otdLog("  err: reader \"%s\" not found by OpenSC\n", readerState.szReader);
         }
-
-        if (doDisconnect)
-                disconnect();
-
+        
         return score;
 }
@@ -384 +385 @@
                 
         // Locate certificates
-        r = sc_pkcs15_get_objects(mScP15Card, SC_PKCS15_TYPE_CERT_X509, objs, 32);
+        r = sc_pkcs15_get_objects(mScP15Card, SC_PKCS15_TYPE_CERT_X509, objs, 32); //FIXME - max objects constant ?
         otdLog("  sc_pkcs15_get_objects(TYPE_CERT_X509): %d\n", r);
         if (r >= 0) {
@@ -419 +420 @@
                         }
                         if (it == mCertificates.end())
-                                otdLog("        no certificate found this key\n");
+                                otdLog("        no certificate found for this key\n");
                         else
                         {
@@ -450 +451 @@
         otdLog("  returning from OpenSCToken::populate()\n");
 }
-
-/* arch-tag: 8A7C3BAF-124C-11D9-A606-000A9595DEEE */

trunk/opensc.tokend/Tokend-11/OpenSC/OpenSCToken.h

@@ -37 +37 @@
 #include "opensc/pkcs15.h"
 #include "opensc/errors.h"
-#include "OpenSCConfig.h"
 
 #include <security_utilities/pcsc++.h>
 
 class OpenSCSchema;
-class OpenSCConfig;
 
 //
@@ -88 +86 @@
         sc_card_t *mScCard;
         sc_pkcs15_card_t *mScP15Card;
-        OpenSCConfig mConfig;
-
+        
 private:
-                void populate();
+        void populate();
         // temporary ACL cache hack - to be removed
         AutoAclOwnerPrototype mAclOwner;

trunk/opensc.tokend/Tokend-11/Tokend.xcodeproj/project.pbxproj

@@ -36 +36 @@
                 E2A907FF093B4FEF00869318 /* libscconf.2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2A907FE093B4FEF00869318 /* libscconf.2.0.0.dylib */; };
                 E2A90801093B501A00869318 /* libpkcs15init.2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2A90800093B501A00869318 /* libpkcs15init.2.0.0.dylib */; };
-                E2D0E303096AF68400B7D157 /* OpenSCConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E2D0E302096AF68400B7D157 /* OpenSCConfig.cpp */; };
                 E4C24C0608C8565400F249D8 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CA8C4D606D6D19400F1BCC8 /* CoreFoundation.framework */; };
                 E4CF7A2F08ED3DE4008D18FA /* OpenSCKeyHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4CF7A1808ED3DE3008D18FA /* OpenSCKeyHandle.cpp */; };
@@ -146 +145 @@
                 4C3C166D06F61D6F00FC8AAC /* KeyHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyHandle.h; sourceTree = "<group>"; };
                 4C55BAFB06DEABE500E4200A /* RecordHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordHandle.h; sourceTree = "<group>"; };
-                4CA858F10654413F0083DED3 /* SecurityTokend.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityTokend.framework; path = /Volumes/Builds/Build8F46/BuildRoot/System/Library/PrivateFrameworks/SecurityTokend.framework; sourceTree = "<absolute>"; };
+                4CA858F10654413F0083DED3 /* SecurityTokend.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityTokend.framework; path = /Volumes/Builds/Build8G32/BuildRoot/System/Library/PrivateFrameworks/SecurityTokend.framework; sourceTree = "<absolute>"; };
                 4CA8C4D606D6D19400F1BCC8 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
                 4CBF5CBE0704E76200EEADC2 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.1.dylib; sourceTree = "<absolute>"; };
                 4CC394790731A4DD00761DEE /* SCardError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCardError.h; sourceTree = "<group>"; };
-                523F79EC06D5AC27004256A0 /* security_cdsa_client.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = security_cdsa_client.framework; path = /Volumes/Builds/Build8F46/BuildRoot/usr/local/SecurityPieces/Frameworks/security_cdsa_client.framework; sourceTree = "<absolute>"; };
-                523F79ED06D5AC27004256A0 /* security_cdsa_utilities.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = security_cdsa_utilities.framework; path = /Volumes/Builds/Build8F46/BuildRoot/usr/local/SecurityPieces/Frameworks/security_cdsa_utilities.framework; sourceTree = "<absolute>"; };
-                523F79EE06D5AC27004256A0 /* security_utilities.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = security_utilities.framework; path = /Volumes/Builds/Build8F46/BuildRoot/usr/local/SecurityPieces/Frameworks/security_utilities.framework; sourceTree = "<absolute>"; };
+                523F79EC06D5AC27004256A0 /* security_cdsa_client.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = security_cdsa_client.framework; path = /Volumes/Builds/Build8G32/BuildRoot/usr/local/SecurityPieces/Frameworks/security_cdsa_client.framework; sourceTree = "<absolute>"; };
+                523F79ED06D5AC27004256A0 /* security_cdsa_utilities.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = security_cdsa_utilities.framework; path = /Volumes/Builds/Build8G32/BuildRoot/usr/local/SecurityPieces/Frameworks/security_cdsa_utilities.framework; sourceTree = "<absolute>"; };
+                523F79EE06D5AC27004256A0 /* security_utilities.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = security_utilities.framework; path = /Volumes/Builds/Build8G32/BuildRoot/usr/local/SecurityPieces/Frameworks/security_utilities.framework; sourceTree = "<absolute>"; };
                 52CA8342067E8175005A1EBA /* PCSC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PCSC.framework; path = /System/Library/Frameworks/PCSC.framework; sourceTree = "<absolute>"; };
                 52CA8343067E8175005A1EBA /* Security.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
                 52DE698106E93B870024EA03 /* PKCS11Object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PKCS11Object.h; sourceTree = "<group>"; };
-                5B1662930942788B00779CE3 /* libtokend.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtokend.a; path = "/Volumes/Builds/Build8F46/BuildRoot/private/var/tmp/Tokend/Tokend-11.obj/UninstalledProducts/libtokend.a"; sourceTree = "<absolute>"; };
+                5B1662930942788B00779CE3 /* libtokend.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtokend.a; path = "/Volumes/Builds/Build8G32/BuildRoot/private/var/tmp/Tokend/Tokend-25868.obj/UninstalledProducts/libtokend.a"; sourceTree = "<absolute>"; };
                 E29A5716093C8886009429AF /* OpenSCLog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = OpenSCLog.cpp; path = OpenSC/OpenSCLog.cpp; sourceTree = SOURCE_ROOT; };
                 E29A5718093C888F009429AF /* OpenSCLog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenSCLog.h; path = OpenSC/OpenSCLog.h; sourceTree = SOURCE_ROOT; };
@@ -162 +161 @@
                 E2A907FE093B4FEF00869318 /* libscconf.2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libscconf.2.0.0.dylib; path = /Library/OpenSC/lib/libscconf.2.0.0.dylib; sourceTree = "<absolute>"; };
                 E2A90800093B501A00869318 /* libpkcs15init.2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpkcs15init.2.0.0.dylib; path = /Library/OpenSC/lib/libpkcs15init.2.0.0.dylib; sourceTree = "<absolute>"; };
-                E2D0E301096AF68400B7D157 /* OpenSCConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenSCConfig.h; sourceTree = "<group>"; };
-                E2D0E302096AF68400B7D157 /* OpenSCConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpenSCConfig.cpp; sourceTree = "<group>"; };
                 E42E576508ED7F5000932114 /* OpenSCError.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenSCError.h; path = OpenSC/OpenSCError.h; sourceTree = SOURCE_ROOT; };
                 E4C24C0708C8565400F249D8 /* OpenSC.tokend */ = {isa = PBXFileReference; explicitFileType = folder; includeInIndex = 0; path = OpenSC.tokend; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -293 +290 @@
                                 E4CF7A2308ED3DE4008D18FA /* OpenSCSchema.h */,
                                 E4CF7A2408ED3DE4008D18FA /* mds */,
-                                E2D0E301096AF68400B7D157 /* OpenSCConfig.h */,
-                                E2D0E302096AF68400B7D157 /* OpenSCConfig.cpp */,
                         );
                         path = OpenSC;
@@ -446 +441 @@
                                 E4CF7A3508ED3DE4008D18FA /* OpenSCError.cpp in Sources */,
                                 E29A5717093C8886009429AF /* OpenSCLog.cpp in Sources */,
-                                E2D0E303096AF68400B7D157 /* OpenSCConfig.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -502 +496 @@
                                         /Library/OpenSC/lib/,
                                         "$(LOCAL_LIBRARY_DIR)/OpenSC/lib",
-                                        "$(SRCROOT)/../../BuildRoot/private/var/tmp/Tokend/Tokend-11.obj/UninstalledProducts",
+                                        "$(SRCROOT)/../../BuildRoot/private/var/tmp/Tokend/Tokend-25868.obj/UninstalledProducts",
                                 );
                                 OPT_CPPXFLAGS = "$(OPT_CXFLAGS) -fno-enforce-eh-specs -fno-implement-inlines -fcoalesce-templates";
@@ -553 +547 @@
                                         /Library/OpenSC/lib/,
                                         "$(LOCAL_LIBRARY_DIR)/OpenSC/lib",
-                                        "$(SRCROOT)/../../BuildRoot/private/var/tmp/Tokend/Tokend-11.obj/UninstalledProducts",
+                                        "$(SRCROOT)/../../BuildRoot/private/var/tmp/Tokend/Tokend-25868.obj/UninstalledProducts",
                                 );
                                 OPT_CPPXFLAGS = "$(OPT_CXFLAGS) -fno-enforce-eh-specs -fno-implement-inlines -fcoalesce-templates";
@@ -604 +598 @@
                                         /Library/OpenSC/lib/,
                                         "$(LOCAL_LIBRARY_DIR)/OpenSC/lib",
-                                        "$(SRCROOT)/../../BuildRoot/private/var/tmp/Tokend/Tokend-11.obj/UninstalledProducts",
+                                        "$(SRCROOT)/../../BuildRoot/private/var/tmp/Tokend/Tokend-25868.obj/UninstalledProducts",
                                 );
                                 OPT_CPPXFLAGS = "$(OPT_CXFLAGS) -fno-enforce-eh-specs -fno-implement-inlines -fcoalesce-templates";
@@ -660 +654 @@
                                         /Library/OpenSC/lib/,
                                         "$(LOCAL_LIBRARY_DIR)/OpenSC/lib",
-                                        "$(SRCROOT)/../../BuildRoot/private/var/tmp/Tokend/Tokend-11.obj/UninstalledProducts",
+                                        "$(SRCROOT)/../../BuildRoot/private/var/tmp/Tokend/Tokend-25868.obj/UninstalledProducts",
                                 );
                                 OPT_CPPXFLAGS = "$(OPT_CXFLAGS) -fno-enforce-eh-specs -fno-implement-inlines -fcoalesce-templates";