Merge pull request #49 from vjardin/fix_openScv1

Fix OpenSC v1
gamringer · Feb 13, 2021 · 1d4bffb · 1d4bffb
2 parents e0a62bd + d852d70
commit 1d4bffb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/tests/0270-oasis_Random.phpt b/tests/0270-oasis_Random.phpt
@@ -24,7 +24,8 @@ $rv = $module->C_OpenSession($s[0], Pkcs11\CKF_SERIAL_SESSION, null, null, $sess
 // TBC $session = new Pkcs11\Session($module, $s[0], Pkcs11\CKF_SERIAL_SESSION); # aka C_OpenSession()
 
 $rv = $module->C_SeedRandom($session, '1603soixantedix8');
-if ($rv === Pkcs11\CKR_RANDOM_SEED_NOT_SUPPORTED)
+if (($rv === Pkcs11\CKR_RANDOM_SEED_NOT_SUPPORTED) ||
+    ($rv === Pkcs11\CKR_FUNCTION_NOT_SUPPORTED))
   $rv = 0; # XXX fake, ignore any smart cards that do not support SeedRandom
 var_dump($rv);
 

diff --git a/tests/0280-oasis_FindObjects.phpt b/tests/0280-oasis_FindObjects.phpt
@@ -67,7 +67,7 @@ int(0)
 int(0)
 object(Pkcs11\Session)#2 (2) {
   ["hSession"]=>
-  int(1)
+  int(%d)
   ["slotID"]=>
   int(%d)
 }

diff --git a/tests/0290-oasis_FindObjects.phpt b/tests/0290-oasis_FindObjects.phpt
@@ -130,7 +130,7 @@ int(0)
 int(0)
 object(Pkcs11\Session)#2 (2) {
   ["hSession"]=>
-  int(1)
+  int(%d)
   ["slotID"]=>
   int(%d)
 }

diff --git a/tests/0291-oasis_FindObjects.phpt b/tests/0291-oasis_FindObjects.phpt
@@ -137,7 +137,7 @@ int(0)
 int(0)
 object(Pkcs11\Session)#2 (2) {
   ["hSession"]=>
-  int(1)
+  int(%d)
   ["slotID"]=>
   int(%d)
 }