Skip reading non eid-cards

Fedict · May 13, 2024 · 168f89b · 168f89b
1 parent a98e904
commit 168f89b
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 18 deletions.
diff --git a/cardcomm/pkcs11/src/cardlayer/card.cpp b/cardcomm/pkcs11/src/cardlayer/card.cpp
@@ -728,24 +728,35 @@ namespace eIDMW
 		SCARDHANDLE hCard, CPCSC * poPCSC, CPinpad * poPinpad)
 	{
 		CCard * poCard = NULL;
-
-		try
-		{
-			bool bIsBeidCard = BeidCardSelectApplet(poPCSC, hCard);
-
-			if (bIsBeidCard)
+		static int iFailingnCount = 0;
+			try
 			{
-				poCard = new CCard(hCard, poPCSC, poPinpad, TRY_SELECT_APPLET, CARD_BEID);
+				bool bIsBeidCard = BeidCardSelectApplet(poPCSC, hCard);
+				if (getReaderToSkip() != csReader || bIsBeidCard) {
+					if (bIsBeidCard)
+					{
+						UnlockReader();
+						poCard = new CCard(hCard, poPCSC, poPinpad, TRY_SELECT_APPLET, CARD_BEID);
+					}
+					else
+					{
+						//Let the chance to eid card to connect
+						if (iFailingnCount < 5)
+						{
+							iFailingnCount++;
+						}
+						else
+						{
+							LockReader(csReader);
+						}
+						poCard = new CCard(hCard, poPCSC, poPinpad, DONT_SELECT_APPLET, CARD_UNKNOWN);
+					}
+				}
 			}
-			else
+			catch (...)
 			{
-				poCard = new CCard(hCard, poPCSC, poPinpad, DONT_SELECT_APPLET, CARD_UNKNOWN);
+				MWLOG(LEV_ERROR, MOD_CAL, L"Exception in cardPluginBeid.CardGetInstance()");
 			}
-		}
-		catch (...)
-		{
-			MWLOG(LEV_ERROR, MOD_CAL, L"Exception in cardPluginBeid.CardGetInstance()");
-		}
 
 		return poCard;
 	}
@@ -1030,10 +1041,10 @@ namespace eIDMW
 
 		CByteArray oAPDU(7 + oData.Size());
 
-		oAPDU.Append(0x00);		//	CLA 00 or 10(chaining)
-		oAPDU.Append(0x88);		//	INS 88 (Internal authenticate)
+		oAPDU.Append(0x00);		//	CLA ‘00’ or ‘10’(chaining)
+		oAPDU.Append(0x88);		//	INS ‘88’ (Internal authenticate)
 		oAPDU.Append(0x02);		//	P1 Algorithm reference(ECDSA SHA-2-384)
-		oAPDU.Append(0x81);		//	P2 Private key reference(81(basic key)
+		oAPDU.Append(0x81);		//	P2 Private key reference(‘81’(basic key)
 		oAPDU.Append((unsigned char)oData.Size() + 2); // length of following bytes
 		oAPDU.Append(0x94);		//	Tag (for challenge is 0x94)
 		oAPDU.Append((unsigned char)oData.Size()); // Length of data
@@ -1602,6 +1613,21 @@ namespace eIDMW
 		return oBuf;
 	}
 
+	void LockReader(const char* csReader)
+	{
+		csReaderToSkip = csReader;
+	}
+
+	void UnlockReader()
+	{
+		csReaderToSkip = "";
+	}
+
+	const char* getReaderToSkip()
+	{
+		return csReaderToSkip;
+	}
+
 	////////////////////////////////////////////////////////////////:
 
 	CAutoLock::CAutoLock(CCard * poCard) :m_poCard(poCard), m_poPCSC(NULL), m_hCard(0)

diff --git a/cardcomm/pkcs11/src/cardlayer/card.h b/cardcomm/pkcs11/src/cardlayer/card.h
@@ -51,6 +51,8 @@ namespace eIDMW
 	const static tPin PinInvalid = { false, "", 0, 0, 0, 0, 0 };
 	const static tPin PinBeid = { true, "Basic PIN", 1, 0, 4, 12, 8 };
 
+	static const char* csReaderToSkip;
+
 	class CCard
 	{
 	public:
@@ -220,7 +222,7 @@ namespace eIDMW
 
 		void SetSecurityEnv(const tPrivKey & key, unsigned long algo, unsigned long ulInputLen);
 		CByteArray SignInternal(const tPrivKey & key, unsigned long algo, const CByteArray & oData,
-			const tPin * pPin = NULL);
+			const tPin * pPin = NULL);		
 
 		CPCSC *m_poPCSC;
 		CPinpad *m_poPinpad;
@@ -276,6 +278,10 @@ namespace eIDMW
 
 	CCard *UnknownCardGetInstance(const char *csReader,
 		SCARDHANDLE hCard, CPCSC * poPCSC, CPinpad * poPinpad);
+
+	void LockReader(const char* csReader);
+	void UnlockReader();
+	const char* getReaderToSkip();
 }
 
 #endif