feat(dlcm):新增m1卡操作接口

liuye
1 parent 691a0ae0
Showing 7 changed files with 121 additions and 1 deletions
dlcm/dlcm/DLCCard.cc
dlcm/dlcm/DLCCard.h
dlcm/dlcm/DLCCardManager.cc
dlcm/dlcm/DLCDevice.cc
dlcm/dlcm/DLCDevice.h
dlcm/dlcm/DLCardManager.h
dlcm/dlcm/stdafx.h
@@ -858,4 +858,58 @@ int DLCCard::SelectCardDir(const unsigned char* dir) const
 	result = SelectDir(dir_hex);
  
 	return result;
-}
 \ No newline at end of file
+}
+
+int DLCCard::M1AuthenticationKey(const unsigned short section, unsigned char* key) const
+{
+	int result = kSuccess;
+
+	do 
+	{
+		if (kSuccess != DLCDevice::Instance().M1LoadKeyHex(0, (const unsigned char*)"ffffffffffff", section))
+		{
+			result = kM1LoadKeyFailed;
+			break;
+		}
+
+		if (kSuccess != DLCDevice::Instance().M1Authentication(0, section))
+		{
+			result = kVerifyKeyFailure;
+			break;
+		}
+	} while (0);
+
+	return result;
+}
+
+int DLCCard::M1ReadCard(const unsigned short block_num, const unsigned char* data) const
+{
+	int result = kSuccess;
+
+	do 
+	{
+		if (kSuccess != DLCDevice::Instance().M1Read(block_num, data))
+		{
+			result = kM1ReadCardFailed;
+			break;
+		}
+	} while (0);
+
+	return result;
+}
+
+int DLCCard::M1WriteCard(const unsigned short block_num, const unsigned char* data) const
+{
+	int result = kSuccess;
+	
+	do 
+	{
+		if (kSuccess != DLCDevice::Instance().M1Write(block_num, data))
+		{
+			result = kM1WriteCardFailed;
+			break;
+		}
+	} while (0);
+
+	return result;
+}
@@ -58,6 +58,10 @@ public:
 	int SOWriteData(const unsigned char* write_key, const unsigned char* random, const unsigned int data_offfset, const unsigned int data_len, const unsigned char* data, unsigned char* cmd) const;
 	int SOSelectDir(const unsigned char* dir, unsigned char* cmd) const;
  
+	int M1AuthenticationKey(const unsigned short section, unsigned char* key) const;
+	int M1ReadCard(const unsigned short block_num, const unsigned char* data) const;
+	int M1WriteCard(const unsigned short block_num, const unsigned char* data) const;
+
 private:
  
 	CardManufacturer CheckCardMF() const;
@@ -77,4 +77,20 @@ int __stdcall DLCSOWriteData(const unsigned char* write_key, const unsigned char
 int __stdcall DLCSOSelectDir(const unsigned char* dir, unsigned char* cmd)
 {
 	return DLCCard::Instance().SOSelectDir(dir, cmd);
+}
+
+//for m1
+DL_DLL_API int __stdcall DLCM1AuthenticationKey(const unsigned short section, unsigned char* key)
+{
+	return DLCCard::Instance().M1AuthenticationKey(section, key);
+}
+
+DL_DLL_API int __stdcall DLCM1ReadCard(const unsigned short block_num, const unsigned char* data)
+{
+	return DLCCard::Instance().M1ReadCard(block_num, data);
+}
+
+DL_DLL_API int __stdcall DLCM1WriteCard(const unsigned short block_num, const unsigned char* data)
+{
+	return DLCCard::Instance().M1WriteCard(block_num, data);
 }
 \ No newline at end of file
@@ -54,6 +54,7 @@ int DLCDevice::FindAndResetCard()
  
 	if (!dc_card(dev_, 0, &snr))
 	{
+		result = kSuccessFindCard;
 		if (!dc_pro_reset(dev_, recv_data_len, recv_data))
 		{
 			result = kSuccess;
@@ -107,3 +108,24 @@ int DLCDevice::FindCard()
 {
 	return FindAndResetCard();
 }
+
+
+int DLCDevice::M1Authentication(const unsigned char mode, const unsigned short section)
+{
+	return dc_authentication(dev_, mode, section);
+}
+
+int DLCDevice::M1LoadKeyHex(const unsigned char mode, const unsigned char* key, const unsigned char section)
+{
+	return dc_load_key_hex(dev_, mode, section, (char*)key);
+}
+
+int DLCDevice::M1Read(const unsigned char adr, const unsigned char* data)
+{
+	return dc_read(dev_, adr, (unsigned char*)data);
+}
+
+int DLCDevice::M1Write(const unsigned char adr, const unsigned char* data)
+{
+	return dc_write(dev_, adr, (unsigned char*)data);
+}
 \ No newline at end of file
@@ -19,6 +19,10 @@ public:
 	int DisconnectDevice();
 	int FindCard();
 	int SendCommand(unsigned char* send_cmd, const unsigned char send_cmd_len, unsigned char* recv_data, unsigned char& recv_data_len);
+	int M1Authentication(const unsigned char mode, const unsigned short section);
+	int M1LoadKeyHex(const unsigned char mode, const unsigned char* key, const unsigned char section);
+	int M1Read(const unsigned char adr, const unsigned char* data);
+	int M1Write(const unsigned char adr, const unsigned char* data);
  
 private:
 	int Connect();
@@ -94,4 +94,20 @@ int __stdcall DLCSOWriteData(const unsigned char* write_key, const unsigned char
  **/
 int __stdcall DLCSOSelectDir(const unsigned char* dir, unsigned char* cmd);
  
+
+//m1卡api
+/*输入section扇区编号,长度为12的16进制秘钥key
+ **/
+DL_DLL_API int __stdcall DLCM1AuthenticationKey(const unsigned short section, unsigned char* key);
+
+/*读取m1卡
+ *输入block_num数据块编号，返回16字节数据块
+ */
+DL_DLL_API int __stdcall DLCM1ReadCard(const unsigned short block_num, const unsigned char* data);
+
+/*写入m1卡
+ *输入block_num数据块编号，返回16字节数据块
+ **/
+DL_DLL_API int __stdcall DLCM1WriteCard(const unsigned short block_num, const unsigned char* data);
+
 #endif //end DL_CARD_MANAGER_H
 \ No newline at end of file
@@ -46,5 +46,9 @@ const int kCardDoNotSupport = 2006;			//卡片不支持
 const int kCreateKeyFileFailed = 2007;		//创建秘钥文件失败
 const int kVerifyKeyFailure = 2008;			//验证秘钥失败
 const int kParameterIsNull = 2009;			//参数为空
+const int kSuccessFindCard = 2010;			//dc_card执行成功，dc_pro_reset失败
+const int kM1LoadKeyFailed = 2011;			//m1卡装载秘钥失败
+const int kM1ReadCardFailed = 2018;			//m1卡读取失败
+const int kM1WriteCardFailed = 2019;		//m1卡写入失败
  
 #endif //end DL_STDAFX_H
 \ No newline at end of file