Changeset 76

Timestamp:

06/20/06 11:00:36 (2 years ago)

Author:

jps

Message:

OpenSC.Tokend: PIN can be changed in KeyChain? Access. Provided by Yannick LEPLARD.

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• opensc.tokend/OpenSC/OpenSCToken.cpp (modified) (2 diffs)
• opensc.tokend/OpenSC/OpenSCToken.h (modified) (1 diff)

trunk/Makefile

@@ -484 +484 @@
         -i opensc-pack/Info.plist -r opensc-pack/resources -d opensc-pack/Description.plist
         cp opensc-pack/InstallationCheck.strings OpenSC.pkg/Contents/Resources/English.lproj
+        cp opensc-pack/InstallationCheck.strings OpenSC.pkg/Contents/Resources
         touch package-opensc
 

trunk/opensc.tokend/OpenSC/OpenSCToken.cpp

@@ -72 +72 @@
 }
 
+
 void OpenSCToken::changePIN(int pinNum,
         const unsigned char *oldPin, size_t oldPinLength,
@@ -80 +81 @@
                 CssmError::throwMe(CSSM_ERRCODE_SAMPLE_VALUE_NOT_SUPPORTED);
         
-        if (oldPinLength < 0 || oldPinLength > 14 ||
-                newPinLength < 0 || newPinLength > 14)
-                CssmError::throwMe(CSSM_ERRCODE_INVALID_SAMPLE_VALUE);
-        
+  if( _changePIN( pinNum, oldPin, oldPinLength, newPin, newPinLength ) ) 
+  {
+                mLocked = false;
+        } 
+  else 
+  {
+                CssmError::throwMe(CSSM_ERRCODE_OPERATION_AUTH_DENIED);
+        }
+  
+}
+                           
+bool OpenSCToken:: _changePIN( int pinNum,
+                               const unsigned char *oldPin, size_t oldPinLength,
+                               const unsigned char *newPin, size_t newPinLength )
+{
+        otdLog("In OpenSCToken::_changePIN(), PIN num is: %d\n", pinNum);
+        
+        int r, i, rv;
+        struct sc_pkcs15_object *objs[32];
+  
+        // pinNum -> AuthID
+        const sc_pkcs15_id_t *auth_id = getIdFromPinMap(pinNum);
+        if (auth_id == NULL) {
+                otdLog("  ERR: getIdFromPinMap(): no AuthID found for pinNum %d\n", pinNum);
+                CssmError::throwMe(CSSM_ERRCODE_INVALID_DATA);
+        }
+  
+        // AuthID -> pin object  +  change pin
+        r = sc_pkcs15_get_objects(mScP15Card, SC_PKCS15_TYPE_AUTH_PIN, objs, 32);
+        otdLog("  sc_pkcs15_get_objects(pin_id=%s): %d\n", sc_pkcs15_print_id(auth_id),  r);
+        if (r >= 0) {
+                for (i = 0; i < r; i++)  {
+                        sc_pkcs15_pin_info_t *pin_info = (sc_pkcs15_pin_info_t *) objs[i]->data;
+                        if (sc_pkcs15_compare_id(auth_id, &pin_info->auth_id)) {
+        
+                                rv = sc_pkcs15_change_pin( mScP15Card, pin_info, oldPin, oldPinLength, newPin, newPinLength );
+                                otdLog("  In OpenSCToken::sc_pkcs15_change_pin returned %d for pin %d\n", rv, pinNum );
+                                if (rv==0) 
+        {
+                                        cachePIN(pin_info, newPin, newPinLength);
+                                        return true;
+                                }
+                                else
+                                        return false;
+                        }
+                }
+        }
+        return false;
 }
 

trunk/opensc.tokend/OpenSC/OpenSCToken.h

@@ -77 +77 @@
         bool _verifyPIN(int pinNum, const unsigned char *pin, size_t pinLength);
 
+  bool OpenSCToken:: _changePIN( int pinNum,
+                                 const unsigned char *oldPin, size_t oldPinLength,
+                                 const unsigned char *newPin, size_t newPinLength );
+    
+
         // To manipulate mPinMap
         void addToPinMap(const sc_pkcs15_id_t *id);