summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0>2006-11-30 23:24:46 +0000
committerrrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0>2006-11-30 23:24:46 +0000
commit59114196cd6e5819507b0fea6f47c6f76b14bb1d (patch)
treea60725f03b6d53f0b04b353a2627dc379768e23e /src
parent78093de42d6edbc4ef0ff9ce2c2b5b33ec3130da (diff)
Remove reset and CUID reading for CAC. This was causing concurrent apps to
loose login state. git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@36 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
Diffstat (limited to 'src')
-rw-r--r--src/coolkey/slot.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/coolkey/slot.cpp b/src/coolkey/slot.cpp
index 6cfde33..ef18e83 100644
--- a/src/coolkey/slot.cpp
+++ b/src/coolkey/slot.cpp
@@ -630,7 +630,7 @@ Slot::connectToToken()
* ... even removing and reinserting the card does not change the
* applet selection,
* do so reset the card now so we can get the CUID
- * NOTE: this will cause other apps to loose login state! */
+ * NOTE: this will cause other apps to loose login state!
CKYCardConnection_Reset(conn);
readCUID(); /* get the CUID before we loose the ability to */
isVersion1Key = 0;
@@ -2041,8 +2041,7 @@ Slot::loadCACCert(CKYByte instance)
CKYBool needRead = 1;
/* see if it matches the shared memory */
- if (shmem.isValid() && shmem.CUIDIsEqual(&mCUID) &&
- shmem.getDataVersion() == dataVersion) {
+ if (shmem.isValid() && shmem.getDataVersion() == dataVersion) {
shmem.readCACCert(&shmCert, instance);
CKYSize certSize = CKYBuffer_Size(&rawCert);
CKYSize shmCertSize = CKYBuffer_Size(&shmCert);
@@ -2071,7 +2070,6 @@ Slot::loadCACCert(CKYByte instance)
/* it doesn't, read the new cert and update the cache */
if (instance == 0) {
shmem.clearValid(0);
- shmem.setCUID(&mCUID);
shmem.setVersion(SHMEM_VERSION);
shmem.setDataVersion(dataVersion);
} else {