|
 |
f477a5 |
diff -up ./esc/src/lib/coolkey/CoolKey.cpp.fix2 ./esc/src/lib/coolkey/CoolKey.cpp
|
|
|
f477a5 |
--- ./esc/src/lib/coolkey/CoolKey.cpp.fix2 2018-10-11 18:34:34.622987227 -0700
|
|
|
f477a5 |
+++ ./esc/src/lib/coolkey/CoolKey.cpp 2018-10-11 18:36:11.918476971 -0700
|
|
|
f477a5 |
@@ -492,13 +492,11 @@ HRESULT CoolKeyGetCUIDDirectly(char *aBu
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
|
|
|
f477a5 |
- assert(cardCtxt);
|
|
|
f477a5 |
if (!cardCtxt) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
conn = CKYCardConnection_Create(cardCtxt);
|
|
|
f477a5 |
- assert(conn);
|
|
|
f477a5 |
if (!conn) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
@@ -559,13 +557,11 @@ HRESULT CoolKeyGetATRDirectly(char *aBuf
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
|
|
|
f477a5 |
- assert(cardCtxt);
|
|
|
f477a5 |
if (!cardCtxt) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
conn = CKYCardConnection_Create(cardCtxt);
|
|
|
f477a5 |
- assert(conn);
|
|
|
f477a5 |
if (!conn) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
@@ -629,13 +625,11 @@ HRESULT CoolKeyGetLifeCycleDirectly(CKYB
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
|
|
|
f477a5 |
- assert(cardCtxt);
|
|
|
f477a5 |
if (!cardCtxt) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
conn = CKYCardConnection_Create(cardCtxt);
|
|
|
f477a5 |
- assert(conn);
|
|
|
f477a5 |
if (!conn) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
@@ -691,13 +685,11 @@ HRESULT CoolKeyGetCPLCDataDirectly(CKYAp
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
|
|
|
f477a5 |
- assert(cardCtxt);
|
|
|
f477a5 |
if (!cardCtxt) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
conn = CKYCardConnection_Create(cardCtxt);
|
|
|
f477a5 |
- assert(conn);
|
|
|
f477a5 |
if (!conn) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
@@ -752,19 +744,16 @@ static void PR_CALLBACK BlinkTimer(void
|
|
|
f477a5 |
const char *readerName = NULL;
|
|
|
f477a5 |
|
|
|
f477a5 |
CKYCardContext *cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
|
|
|
f477a5 |
- assert(cardCtxt);
|
|
|
f477a5 |
if (!cardCtxt) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
conn = CKYCardConnection_Create(cardCtxt);
|
|
|
f477a5 |
- assert(conn);
|
|
|
f477a5 |
if (!conn) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
readerName = GetReaderNameForKeyID(¶ms->mKey);
|
|
|
f477a5 |
- assert(readerName);
|
|
|
f477a5 |
if (!readerName) {
|
|
|
f477a5 |
goto done;
|
|
|
f477a5 |
}
|
|
|
f477a5 |
@@ -1336,7 +1325,6 @@ HRESULT CoolKeyGetIssuerInfo(const CoolK
|
|
|
f477a5 |
|
|
|
f477a5 |
CKYCardContext *cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
|
|
|
f477a5 |
|
|
|
f477a5 |
- assert(cardCtxt);
|
|
|
f477a5 |
if (!cardCtxt) {
|
|
|
f477a5 |
CoolKeyLogMsg( PR_LOG_ERROR, "%s Attempting to get key issuer info. Can't create Card Context !.\n",GetTStamp(tBuff,56));
|
|
|
f477a5 |
result = E_FAIL;
|
|
|
f477a5 |
@@ -1344,7 +1332,6 @@ HRESULT CoolKeyGetIssuerInfo(const CoolK
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
conn = CKYCardConnection_Create(cardCtxt);
|
|
|
f477a5 |
- assert(conn);
|
|
|
f477a5 |
if (!conn) {
|
|
|
f477a5 |
CoolKeyLogMsg( PR_LOG_ERROR, "%s Attempting to get key issuer info. Can't create Card Connection!\n",GetTStamp(tBuff,56));
|
|
|
f477a5 |
result = E_FAIL;
|
|
|
f477a5 |
@@ -1352,7 +1339,6 @@ HRESULT CoolKeyGetIssuerInfo(const CoolK
|
|
|
f477a5 |
}
|
|
|
f477a5 |
|
|
|
f477a5 |
readerName = GetReaderNameForKeyID(aKey);
|
|
|
f477a5 |
- assert(readerName);
|
|
|
f477a5 |
if (!readerName) {
|
|
|
f477a5 |
CoolKeyLogMsg( PR_LOG_ERROR, "%s Attempting to get key issuer info. Can't get reader name!\n",GetTStamp(tBuff,56));
|
|
|
f477a5 |
result = E_FAIL;
|