From 6c51e4089107e30916876b59679f4a0f32e4d09c Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Sat, 7 Nov 2020 01:14:51 +0100 Subject: [PATCH] Added: Complete Real Test --- NFC/ISO7816-4/APDUResponse.cs | 20 + NFC/NXP MIFARE DESFire/APDUStatusCodes.cs | 2 - NFC/NXP MIFARE DESFire/CMAC.cs | 106 ---- NFC/NXP MIFARE DESFire/CryptoOperations.cs | 13 - NFC/NXP MIFARE DESFire/MIFARE_DESFire.cs | 567 +++++++----------- .../PCSC/{Hardware.cs => PCSC_Hardware.cs} | 4 +- .../PCSC/{Reader.cs => PCSC_Reader.cs} | 6 +- NFC_Test/Crypto/AES_Test.cs | 16 +- NFC_Test/Crypto/CRC16_Test.cs | 2 +- NFC_Test/Crypto/CRC32_Test.cs | 2 +- NFC_Test/Crypto/CipherKey_Test.cs | 13 + NFC_Test/Crypto/TDES_Test.cs | 36 +- NFC_Test/HexConverter_Test.cs | 2 +- NFC_Test/ISO7816-4/APDUCommand_Test.cs | 2 +- .../NXP MIFARE DESFire/Command_Card_Test.cs | 308 ---------- NFC_Test/NXP MIFARE DESFire/Command_Test.cs | 10 - .../NXP MIFARE DESFire/MIFARE_DESFire_Test.cs | 193 ++++-- NFC_Test/NamespaceSetUp.cs | 21 +- NFC_Test/REAL_DESFireCommands.cs | 477 +++++++++++++++ ...FabAccess_OTA.cs => REAL_FabAccess_OTA.cs} | 37 +- NFC_Test/REAL_Reader_PCSC.cs | 62 ++ NFC_Test/REAL_Windows.cs | 129 ---- NFC_Test/REAL_Windows_CardSetUp.cs | 191 ------ 23 files changed, 1020 insertions(+), 1199 deletions(-) delete mode 100644 NFC/NXP MIFARE DESFire/CMAC.cs delete mode 100644 NFC/NXP MIFARE DESFire/CryptoOperations.cs rename NFC/Readers/PCSC/{Hardware.cs => PCSC_Hardware.cs} (87%) rename NFC/Readers/PCSC/{Reader.cs => PCSC_Reader.cs} (88%) create mode 100644 NFC_Test/Crypto/CipherKey_Test.cs delete mode 100644 NFC_Test/NXP MIFARE DESFire/Command_Card_Test.cs delete mode 100644 NFC_Test/NXP MIFARE DESFire/Command_Test.cs create mode 100644 NFC_Test/REAL_DESFireCommands.cs rename NFC_Test/{FabAccess_OTA.cs => REAL_FabAccess_OTA.cs} (82%) create mode 100644 NFC_Test/REAL_Reader_PCSC.cs delete mode 100644 NFC_Test/REAL_Windows.cs delete mode 100644 NFC_Test/REAL_Windows_CardSetUp.cs diff --git a/NFC/ISO7816-4/APDUResponse.cs b/NFC/ISO7816-4/APDUResponse.cs index a52d62b..61e8501 100644 --- a/NFC/ISO7816-4/APDUResponse.cs +++ b/NFC/ISO7816-4/APDUResponse.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using NFC.Mifare_DESFire; @@ -129,6 +130,25 @@ namespace NFC.ISO7816_4 return array; } + + public override bool Equals(object obj) + { + return obj is APDUResponse response && + EqualityComparer.Default.Equals(Body, response.Body) && + SW1 == response.SW1 && + SW2 == response.SW2; + } + + public override int GetHashCode() + { + return HashCode.Combine(Body, SW1, SW2); + } + + public override string ToString() + { + string pattern = "SW1: 0x{0:x} | SW2: 0x{1:x} | Body: 0x{2:x}"; + return string.Format(pattern, SW1, SW2, Body); + } #endregion } } diff --git a/NFC/NXP MIFARE DESFire/APDUStatusCodes.cs b/NFC/NXP MIFARE DESFire/APDUStatusCodes.cs index a06327b..06fa336 100644 --- a/NFC/NXP MIFARE DESFire/APDUStatusCodes.cs +++ b/NFC/NXP MIFARE DESFire/APDUStatusCodes.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace NFC.Mifare_DESFire { diff --git a/NFC/NXP MIFARE DESFire/CMAC.cs b/NFC/NXP MIFARE DESFire/CMAC.cs deleted file mode 100644 index 532aa23..0000000 --- a/NFC/NXP MIFARE DESFire/CMAC.cs +++ /dev/null @@ -1,106 +0,0 @@ -using NFC.Crypto; -using System; - -namespace NFC.NXP_MIFARE_DESFire -{ - public class CMAC - { - #region Contructors - public CMAC(CipherType cipher) - { - switch(cipher) - { - case(CipherType.TDES): - _Cipher = new TDES(); - break; - case(CipherType.TDES_2K): - _Cipher = new TDES_2K(); - break; - case(CipherType.TDES_3K): - _Cipher = new TDES_3K(); - break; - case (CipherType.AES): - _Cipher = new AES(); - break; - default: - throw new ArgumentException("Unkown Cipher Type."); - } - } - - public CMAC(ICipher cipher) - { - _Cipher = cipher ?? throw new ArgumentNullException(); - } - #endregion - - #region Properties - private ICipher _Cipher; - #endregion - - #region Methods - /// - /// Generate Key with all Zeros, in KeySize - /// - public byte[] GenerateEmpytKey() - { - byte[] key = new byte[_Cipher.KeySize]; - for (int i = 0; i < _Cipher.KeySize; i++) - { - key[i] = 0; - } - - return key; - } - - /// - /// Generate IV with all Zeros, in KeySize - /// - public byte[] GenerateEmpytIV() - { - byte[] key = new byte[_Cipher.BlockSize]; - for (int i = 0; i < _Cipher.BlockSize; i++) - { - key[i] = 0; - } - - return key; - } - - /// - /// Encrypt Data - /// - public byte[] Encrypt(byte[] data) - { - throw new NotImplementedException(); - } - - /// - /// Decrypt Data - /// - public byte[] Decrypt(byte[] data) - { - throw new NotImplementedException(); - } - - /// - /// - /// - /// Two Keys - public byte[][] GenerateSubKey() - { - throw new NotImplementedException(); - } - - /// - /// - /// - /// - /// - public byte[] Digest(byte[] data) - { - throw new NotImplementedException(); - } - - #endregion - } -} diff --git a/NFC/NXP MIFARE DESFire/CryptoOperations.cs b/NFC/NXP MIFARE DESFire/CryptoOperations.cs deleted file mode 100644 index 0ae77af..0000000 --- a/NFC/NXP MIFARE DESFire/CryptoOperations.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace NFC.Mifare_DESFire -{ - enum CryptoOperations : byte - { - TDES = 0x00, - TKTDES = 0x40, - AES = 0x80, - } -} diff --git a/NFC/NXP MIFARE DESFire/MIFARE_DESFire.cs b/NFC/NXP MIFARE DESFire/MIFARE_DESFire.cs index 092b9d1..185d78c 100644 --- a/NFC/NXP MIFARE DESFire/MIFARE_DESFire.cs +++ b/NFC/NXP MIFARE DESFire/MIFARE_DESFire.cs @@ -1,5 +1,4 @@ -using log4net.Repository.Hierarchy; -using NFC.Crypto; +using NFC.Crypto; using NFC.ISO7816_4; using NFC.Mifare_DESFire.Enums; using NFC.NXP_MIFARE_DESFire.Exceptions; @@ -7,7 +6,6 @@ using PCSC.Iso7816; using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; namespace NFC.Mifare_DESFire { @@ -54,7 +52,7 @@ namespace NFC.Mifare_DESFire /// Generate Byte Array filled with 0 /// /// Size of Array - public byte[] GenerateEmptyKey(uint size) + public byte[] GenerateEmptyArray(uint size) { byte[] key = new byte[size]; for (int i = 0; i < size; i++) @@ -66,42 +64,12 @@ namespace NFC.Mifare_DESFire } /// - /// Converts byte[] to string with HEX Code - /// No 0x is created + /// Get Range of Array Elements /// - /// Data - public string ConvertToHexString(byte[] data) - { - return BitConverter.ToString(data).Replace("-", "").ToLower(); - } - - /// - /// Converts string with HEX Code to byte[] - /// No 0x is requiered - /// - /// Data - public byte[] ConvertFromHexString(string data) - { - if (data.Length % 2 == 1) - throw new Exception("Data Length is uneven."); - - byte[] arr = new byte[data.Length >> 1]; - - for (int i = 0; i < data.Length >> 1; ++i) - { - arr[i] = (byte)((GetHexVal(data[i << 1]) << 4) + (GetHexVal(data[(i << 1) + 1]))); - } - - return arr; - } - - /// - /// Get Range of Array - /// - /// - /// - /// - /// + /// Array + /// Offset in Byte + /// Lenght to read in Byte + /// new Array with Range of Array Elements public byte[] GetSubArray(byte[] array, long offset, long length) { byte[] subarray = new byte[length]; @@ -112,17 +80,6 @@ namespace NFC.Mifare_DESFire return subarray; } - private int GetHexVal(char hex) - { - int val = (int)hex; - //For uppercase A-F letters: - //return val - (val < 58 ? 48 : 55); - //For lowercase a-f letters: - //return val - (val < 58 ? 48 : 87); - //Or the two combined, but a bit slower: - return val - (val < 58 ? 48 : (val < 97 ? 55 : 87)); - } - /// /// Check APDU Response for DESFire Error Codes /// https://www.nxp.com/docs/en/data-sheet/MF2DLHX0.pdf @@ -206,6 +163,35 @@ namespace NFC.Mifare_DESFire return lastblock; } + /// + /// Expand Array to Block Size, fill with 0x00 + /// + /// + public byte[] ExpandToBlockSize(byte[] data, uint bocksize) + { + if (data == null) + { + throw new ArgumentNullException("Data cannot be null."); + } + + int diff = data.Length % (int)bocksize; + if (diff == 0) + { + return data; + } + + byte[] expand = new byte[data.Length + bocksize - diff]; + + data.CopyTo(expand, 0); + + for (int i = expand.Length - 1; i > data.Length - 1; i--) + { + expand[i] = 0x00; + } + + return expand; + } + /// /// Rotates Array to the left /// @@ -310,6 +296,7 @@ namespace NFC.Mifare_DESFire return c; } + /// /// Generates SessionKey for DES Authentification /// @@ -364,62 +351,89 @@ namespace NFC.Mifare_DESFire return sesssionkey; } + #endregion + #region Configuration Generator /// - /// Set KeyVersion in DES Key - /// KeyVersion is stored in LSB of the first 8 Bytes of the DES Key + /// Genearte KeySetting1 for Application Settings or PICC Setting /// - public byte[] SetKeyVersion(byte[] key, byte keyversion) + public byte GenerateKeySetting1(ChangeApplicationKey changeKey, ChangeMasterKeySettings changeMasterKeySettings, CreateDeleteFile createDeleteFile, FileDirectoryAccess fileDirectoryAccess, ChangeMasterKey changeMasterKey) { - byte[] pow2 = new byte[] - { - 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - }; - - byte[] new_key = new byte[key.Length]; - key.CopyTo(new_key, 0); - - for (int i = 0; i < 8; i++) - { - if ((keyversion & pow2[i]) > 0) - { - new_key[i] = (byte)(new_key[5] | 0x01); - } - else - { - new_key[i] = (byte)(new_key[5] & 0x7F); - } - } - - return new_key; + return (byte)(((byte)changeKey << 4) | (byte)changeMasterKeySettings | (byte)createDeleteFile | (byte)fileDirectoryAccess | (byte)changeMasterKey); } /// - /// Expand Array to Block Size, fill with 0x00 + /// Genearte KeySetting1 for Application Settings or PICC Setting /// - /// - public byte[] ExpandToBlockSize(byte[] data, uint bocksize) + /// ID of Key for changing Application Keys + /// + public byte GenerateKeySetting1(byte changeKey, ChangeMasterKeySettings changeMasterKeySettings, CreateDeleteFile createDeleteFile, FileDirectoryAccess fileDirectoryAccess, ChangeMasterKey changeMasterKey) { - int diff = data.Length % (int)bocksize; - if (diff == 0) + if (changeKey < 0x01 || changeKey >= 0x0E) { - return data; + throw new ArgumentOutOfRangeException(); + } + return GenerateKeySetting1((ChangeApplicationKey)changeKey, changeMasterKeySettings, createDeleteFile, fileDirectoryAccess, changeMasterKey); + } + + /// + /// Genearte KeySetting2 for Application Creation + /// + /// Number of keys that can be stored within the application (0x01-0x0D) + /// + public byte GenerateKeySetting2(CryptoOperationsType cryptoOperations, FileIdentifies fileIdentifies, byte numberOfKeys) + { + if (numberOfKeys < 0x01 || numberOfKeys >= 0x0D) + { + throw new ArgumentOutOfRangeException(); } - byte[] expand = new byte[data.Length + bocksize - diff]; + return (byte)((byte)cryptoOperations | (byte)fileIdentifies | numberOfKeys); + } - data.CopyTo(expand, 0); - - for (int i = expand.Length - 1; i > data.Length - 1; i--) + /// + /// Generate FileAccess Rights for File Settings + /// Use enum AccesRights for Free or Never Option + /// + /// KeyID for Read Access + /// KeyID for Write Access + /// KeyID for Read and Write Access + /// KeyID for Configuration Access + public UInt16 GenerateFileAccessRights(byte read, byte write, byte read_write, byte configure) + { + if (read > 0x0F || write > 0x0F || read_write > 0x0F || configure > 0x0F) { - expand[i] = 0x00; + throw new ArgumentOutOfRangeException("One KeyID is not valid"); } - return expand; + return (UInt16)((read << 12) | (write << 8) | (read_write << 4) | configure); } #endregion #region DESFire Commands + /// + /// Format PICC + /// Works after PICC Authentication + /// + public void Format() + { + _Log.Debug("Start Format"); + + APDUCommand cmd_format = new APDUCommand(IsoCase.Case2Short) + { + CLA = 0x90, + INS = 0xFC, + }; + _Log.DebugFormat("APDU_CMD(cmd_format): {0}", HexConverter.ConvertToHexString(cmd_format.ToArray())); + + APDUResponse response = _Card.Transmit(cmd_format); + _Log.DebugFormat("APDU_RES(cmd_format): {0}", HexConverter.ConvertToHexString(response.ToArray())); + + CheckAPDUResponse(response); + + _Log.Debug("End Format"); + } + /// /// Authenticate to PICC, with ISO Authenticate /// @@ -443,24 +457,24 @@ namespace NFC.Mifare_DESFire key_id } }; - _Log.DebugFormat("APDU_CMD(cmd_challange_request): {0}", ConvertToHexString(cmd_challange_request.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_challange_request): {0}", HexConverter.ConvertToHexString(cmd_challange_request.ToArray())); APDUResponse response = _Card.Transmit(cmd_challange_request); - _Log.DebugFormat("APDU_RES(cmd_challange_request): {0}", ConvertToHexString(response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_challange_request): {0}", HexConverter.ConvertToHexString(response.ToArray())); CheckAPDUResponse(response); byte[] rndB_enc = response.Body; - _Log.DebugFormat("rndB_enc: {0}", ConvertToHexString(rndB_enc)); + _Log.DebugFormat("rndB_enc: {0}", HexConverter.ConvertToHexString(rndB_enc)); TDES des = new TDES(); - byte[] rndB = des.Decrypt(rndB_enc, key, GenerateEmptyKey(8)); - _Log.DebugFormat("rndB: {0}", ConvertToHexString(rndB)); + byte[] rndB = des.Decrypt(rndB_enc, key, GenerateEmptyArray(8)); + _Log.DebugFormat("rndB: {0}", HexConverter.ConvertToHexString(rndB)); rndB.CopyTo(iv, 0); byte[] rndB_rl = RotateLeft(rndB); - _Log.DebugFormat("rndB_enc: {0}", ConvertToHexString(rndB_rl)); + _Log.DebugFormat("rndB_enc: {0}", HexConverter.ConvertToHexString(rndB_rl)); if(rndA == null) { @@ -468,13 +482,13 @@ namespace NFC.Mifare_DESFire rndA = new byte[8]; rnd.NextBytes(rndA); } - _Log.DebugFormat("rndA: {0}", ConvertToHexString(rndA)); + _Log.DebugFormat("rndA: {0}", HexConverter.ConvertToHexString(rndA)); byte[] rndAB = Concatenate(rndA, rndB_rl); - _Log.DebugFormat("rndAB: {0}", ConvertToHexString(rndAB)); + _Log.DebugFormat("rndAB: {0}", HexConverter.ConvertToHexString(rndAB)); byte[] rndAB_enc = des.Encrypt(rndAB, key, rndB_enc); - _Log.DebugFormat("rndA_rndB_enc: {0}", ConvertToHexString(rndAB_enc)); + _Log.DebugFormat("rndA_rndB_enc: {0}", HexConverter.ConvertToHexString(rndAB_enc)); iv = ExtractLastBlock(rndAB_enc, 8); APDUCommand cmd_challange_response = new APDUCommand(IsoCase.Case4Short) @@ -483,21 +497,21 @@ namespace NFC.Mifare_DESFire INS = 0xAF, Data = rndAB_enc }; - _Log.DebugFormat("APDU_CMD(cmd_challange_response): {0}", ConvertToHexString(cmd_challange_response.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_challange_response): {0}", HexConverter.ConvertToHexString(cmd_challange_response.ToArray())); response = _Card.Transmit(cmd_challange_response); - _Log.DebugFormat("APDU_RES(cmd_challange_response): {0}", ConvertToHexString(cmd_challange_response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_challange_response): {0}", HexConverter.ConvertToHexString(cmd_challange_response.ToArray())); CheckAPDUResponse(response); byte[] encryptedRndAFromCard = response.Body; - _Log.DebugFormat("encryptedRndAFromCard: {0}", ConvertToHexString(encryptedRndAFromCard)); + _Log.DebugFormat("encryptedRndAFromCard: {0}", HexConverter.ConvertToHexString(encryptedRndAFromCard)); byte[] rotatedRndAFromCard = des.Decrypt(encryptedRndAFromCard, key, iv); - _Log.DebugFormat("rotatedRndAFromCard: {0}", ConvertToHexString(rotatedRndAFromCard)); + _Log.DebugFormat("rotatedRndAFromCard: {0}", HexConverter.ConvertToHexString(rotatedRndAFromCard)); byte[] rndAFromCard = RotateRight(rotatedRndAFromCard); - _Log.DebugFormat("rndAFromCard: {0}", ConvertToHexString(rndAFromCard)); + _Log.DebugFormat("rndAFromCard: {0}", HexConverter.ConvertToHexString(rndAFromCard)); if (!rndA.SequenceEqual(rndAFromCard)) { @@ -505,36 +519,14 @@ namespace NFC.Mifare_DESFire } _SessionKey = GenerateSesionKey_DES(rndA, rndB); - _Log.DebugFormat("_SessionKey: {0}", ConvertToHexString(_SessionKey)); + _Log.DebugFormat("_SessionKey: {0}", HexConverter.ConvertToHexString(_SessionKey)); - _IV = GenerateEmptyKey(8); - _Log.DebugFormat("_IV: {0}", ConvertToHexString(_IV)); + _IV = GenerateEmptyArray(8); + _Log.DebugFormat("_IV: {0}", HexConverter.ConvertToHexString(_IV)); _Log.Debug("End AuthenticateISO_DES"); } - /// - /// Format PICC - /// - public void Format() - { - _Log.Debug("Start Format"); - - APDUCommand cmd_format = new APDUCommand(IsoCase.Case2Short) - { - CLA = 0x90, - INS = 0xFC, - }; - _Log.DebugFormat("APDU_CMD(cmd_format): {0}", ConvertToHexString(cmd_format.ToArray())); - - APDUResponse response = _Card.Transmit(cmd_format); - _Log.DebugFormat("APDU_RES(cmd_format): {0}", ConvertToHexString(response.ToArray())); - - CheckAPDUResponse(response); - - _Log.Debug("End Format"); - } - /// /// Create Application for ID /// @@ -544,7 +536,7 @@ namespace NFC.Mifare_DESFire _Log.Debug("Start CreateApplication"); byte[] id_byte = BitConverter.GetBytes(aid); - _Log.DebugFormat("AID: {0}", ConvertToHexString(id_byte.ToArray())); + _Log.DebugFormat("AID: {0}", HexConverter.ConvertToHexString(id_byte.ToArray())); APDUCommand cmd_CreateApplication = new APDUCommand(IsoCase.Case4Short) { @@ -559,10 +551,10 @@ namespace NFC.Mifare_DESFire keysetting2 } }; - _Log.DebugFormat("APDU_CMD(cmd_CreateApplication): {0}", ConvertToHexString(cmd_CreateApplication.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_CreateApplication): {0}", HexConverter.ConvertToHexString(cmd_CreateApplication.ToArray())); APDUResponse response = _Card.Transmit(cmd_CreateApplication); - _Log.DebugFormat("APDU_RES(cmd_CreateApplication): {0}", ConvertToHexString(response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_CreateApplication): {0}", HexConverter.ConvertToHexString(response.ToArray())); CheckAPDUResponse(response); @@ -578,7 +570,7 @@ namespace NFC.Mifare_DESFire _Log.Debug("Start SelectApplication"); byte[] id_byte = BitConverter.GetBytes(aid); - _Log.DebugFormat("AID: {0}", ConvertToHexString(id_byte.ToArray())); + _Log.DebugFormat("AID: {0}", HexConverter.ConvertToHexString(id_byte.ToArray())); APDUCommand cmd_SelectApplication = new APDUCommand(IsoCase.Case4Short) { @@ -591,10 +583,10 @@ namespace NFC.Mifare_DESFire id_byte[2] } }; - _Log.DebugFormat("APDU_CMD(cmd_SelectApplication): {0}", ConvertToHexString(cmd_SelectApplication.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_SelectApplication): {0}", HexConverter.ConvertToHexString(cmd_SelectApplication.ToArray())); APDUResponse response = _Card.Transmit(cmd_SelectApplication); - _Log.DebugFormat("APDU_RES(cmd_SelectApplication): {0}", ConvertToHexString(response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_SelectApplication): {0}", HexConverter.ConvertToHexString(response.ToArray())); CheckAPDUResponse(response); @@ -624,24 +616,24 @@ namespace NFC.Mifare_DESFire key_id } }; - _Log.DebugFormat("APDU_CMD(cmd_challange_request): {0}", ConvertToHexString(cmd_challange_request.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_challange_request): {0}", HexConverter.ConvertToHexString(cmd_challange_request.ToArray())); APDUResponse response = _Card.Transmit(cmd_challange_request); - _Log.DebugFormat("APDU_RES(cmd_challange_request): {0}", ConvertToHexString(response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_challange_request): {0}", HexConverter.ConvertToHexString(response.ToArray())); CheckAPDUResponse(response); byte[] rndB_enc = response.Body; - _Log.DebugFormat("rndB_enc: {0}", ConvertToHexString(rndB_enc)); + _Log.DebugFormat("rndB_enc: {0}", HexConverter.ConvertToHexString(rndB_enc)); AES aes = new AES(); - byte[] rndB = aes.Decrypt(rndB_enc, key, GenerateEmptyKey(16)); - _Log.DebugFormat("rndB: {0}", ConvertToHexString(rndB)); + byte[] rndB = aes.Decrypt(rndB_enc, key, GenerateEmptyArray(16)); + _Log.DebugFormat("rndB: {0}", HexConverter.ConvertToHexString(rndB)); rndB.CopyTo(iv, 0); byte[] rndB_rl = RotateLeft(rndB); - _Log.DebugFormat("rndB_enc: {0}", ConvertToHexString(rndB_rl)); + _Log.DebugFormat("rndB_enc: {0}", HexConverter.ConvertToHexString(rndB_rl)); if (rndA == null) { @@ -649,13 +641,13 @@ namespace NFC.Mifare_DESFire rndA = new byte[16]; rnd.NextBytes(rndA); } - _Log.DebugFormat("rndA: {0}", ConvertToHexString(rndA)); + _Log.DebugFormat("rndA: {0}", HexConverter.ConvertToHexString(rndA)); byte[] rndAB = Concatenate(rndA, rndB_rl); - _Log.DebugFormat("rndAB: {0}", ConvertToHexString(rndAB)); + _Log.DebugFormat("rndAB: {0}", HexConverter.ConvertToHexString(rndAB)); byte[] rndAB_enc = aes.Encrypt(rndAB, key, rndB_enc); - _Log.DebugFormat("rndA_rndB_enc: {0}", ConvertToHexString(rndAB_enc)); + _Log.DebugFormat("rndA_rndB_enc: {0}", HexConverter.ConvertToHexString(rndAB_enc)); iv = ExtractLastBlock(rndAB_enc, 16); APDUCommand cmd_challange_response = new APDUCommand(IsoCase.Case4Short) @@ -664,21 +656,21 @@ namespace NFC.Mifare_DESFire INS = 0xAF, Data = rndAB_enc }; - _Log.DebugFormat("APDU_CMD(cmd_challange_response): {0}", ConvertToHexString(cmd_challange_response.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_challange_response): {0}", HexConverter.ConvertToHexString(cmd_challange_response.ToArray())); response = _Card.Transmit(cmd_challange_response); - _Log.DebugFormat("APDU_RES(cmd_challange_response): {0}", ConvertToHexString(cmd_challange_response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_challange_response): {0}", HexConverter.ConvertToHexString(cmd_challange_response.ToArray())); CheckAPDUResponse(response); byte[] encryptedRndAFromCard = response.Body; - _Log.DebugFormat("encryptedRndAFromCard: {0}", ConvertToHexString(encryptedRndAFromCard)); + _Log.DebugFormat("encryptedRndAFromCard: {0}", HexConverter.ConvertToHexString(encryptedRndAFromCard)); byte[] rotatedRndAFromCard = aes.Decrypt(encryptedRndAFromCard, key, iv); - _Log.DebugFormat("rotatedRndAFromCard: {0}", ConvertToHexString(rotatedRndAFromCard)); + _Log.DebugFormat("rotatedRndAFromCard: {0}", HexConverter.ConvertToHexString(rotatedRndAFromCard)); byte[] rndAFromCard = RotateRight(rotatedRndAFromCard); - _Log.DebugFormat("rndAFromCard: {0}", ConvertToHexString(rndAFromCard)); + _Log.DebugFormat("rndAFromCard: {0}", HexConverter.ConvertToHexString(rndAFromCard)); if (!rndA.SequenceEqual(rndAFromCard)) { @@ -686,10 +678,10 @@ namespace NFC.Mifare_DESFire } _SessionKey = GenerateSesionKey_AES(rndA, rndB); - _Log.DebugFormat("_SessionKey: {0}", ConvertToHexString(_SessionKey)); + _Log.DebugFormat("_SessionKey: {0}", HexConverter.ConvertToHexString(_SessionKey)); - _IV = GenerateEmptyKey(16); - _Log.DebugFormat("_IV: {0}", ConvertToHexString(_IV)); + _IV = GenerateEmptyArray(16); + _Log.DebugFormat("_IV: {0}", HexConverter.ConvertToHexString(_IV)); _Log.Debug("End AuthenticateISO_DES"); } @@ -708,31 +700,31 @@ namespace NFC.Mifare_DESFire { 0xC4, key_id }; - _Log.DebugFormat("header: {0}", ConvertToHexString(header)); + _Log.DebugFormat("header: {0}", HexConverter.ConvertToHexString(header)); byte[] key_and_version = new_key; byte[] command = Concatenate(header, key_and_version); - _Log.DebugFormat("command: {0}", ConvertToHexString(command)); + _Log.DebugFormat("command: {0}", HexConverter.ConvertToHexString(command)); CRC32 crc32 = new CRC32(); byte[] crc = crc32.Calculate(command); - _Log.DebugFormat("crc: {0}", ConvertToHexString(crc)); + _Log.DebugFormat("crc: {0}", HexConverter.ConvertToHexString(crc)); byte[] cryptogram = Concatenate(key_and_version, crc); - _Log.DebugFormat("cryptogram: {0}", ConvertToHexString(cryptogram)); + _Log.DebugFormat("cryptogram: {0}", HexConverter.ConvertToHexString(cryptogram)); byte[] cryptogram_block = ExpandToBlockSize(cryptogram, 16); - _Log.DebugFormat("cryptogram_block: {0}", ConvertToHexString(cryptogram_block)); + _Log.DebugFormat("cryptogram_block: {0}", HexConverter.ConvertToHexString(cryptogram_block)); TDES des = new TDES(); byte[] cryptogram_enc = des.Encrypt(cryptogram_block, _SessionKey, _IV); - _Log.DebugFormat("cryptogram_enc: {0}", ConvertToHexString(cryptogram_enc)); + _Log.DebugFormat("cryptogram_enc: {0}", HexConverter.ConvertToHexString(cryptogram_enc)); _IV = ExtractLastBlock(cryptogram_enc, 8); - _Log.DebugFormat("_IV: {0}", ConvertToHexString(_IV)); + _Log.DebugFormat("_IV: {0}", HexConverter.ConvertToHexString(_IV)); byte[] data = Concatenate(new byte[] { key_id }, cryptogram_enc); - _Log.DebugFormat("data: {0}", ConvertToHexString(data)); + _Log.DebugFormat("data: {0}", HexConverter.ConvertToHexString(data)); APDUCommand cmd_ChangeKey = new APDUCommand(IsoCase.Case4Short) { @@ -740,10 +732,10 @@ namespace NFC.Mifare_DESFire INS = 0xC4, Data = data }; - _Log.DebugFormat("APDU_CMD(cmd_ChangeKey): {0}", ConvertToHexString(cmd_ChangeKey.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_ChangeKey): {0}", HexConverter.ConvertToHexString(cmd_ChangeKey.ToArray())); APDUResponse response = _Card.Transmit(cmd_ChangeKey); - _Log.DebugFormat("APDU_RES(cmd_ChangeKey): {0}", ConvertToHexString(response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_ChangeKey): {0}", HexConverter.ConvertToHexString(response.ToArray())); CheckAPDUResponse(response); @@ -764,32 +756,32 @@ namespace NFC.Mifare_DESFire { 0xC4, key_id }; - _Log.DebugFormat("header: {0}", ConvertToHexString(header)); + _Log.DebugFormat("header: {0}", HexConverter.ConvertToHexString(header)); // AES Key Version is Append to Key byte[] key_and_version = Concatenate(new_key, new byte[] { key_version }); byte[] command = Concatenate(header, key_and_version); - _Log.DebugFormat("command: {0}", ConvertToHexString(command)); + _Log.DebugFormat("command: {0}", HexConverter.ConvertToHexString(command)); CRC32 crc32 = new CRC32(); byte[] crc = crc32.Calculate(command); - _Log.DebugFormat("crc: {0}", ConvertToHexString(crc)); + _Log.DebugFormat("crc: {0}", HexConverter.ConvertToHexString(crc)); byte[] cryptogram = Concatenate(key_and_version, crc); - _Log.DebugFormat("cryptogram: {0}", ConvertToHexString(cryptogram)); + _Log.DebugFormat("cryptogram: {0}", HexConverter.ConvertToHexString(cryptogram)); byte[] cryptogram_block = ExpandToBlockSize(cryptogram, 16); - _Log.DebugFormat("cryptogram_block: {0}", ConvertToHexString(cryptogram_block)); + _Log.DebugFormat("cryptogram_block: {0}", HexConverter.ConvertToHexString(cryptogram_block)); AES aes = new AES(); byte[] cryptogram_enc = aes.Encrypt(cryptogram_block, _SessionKey, _IV); - _Log.DebugFormat("cryptogram_enc: {0}", ConvertToHexString(cryptogram_enc)); + _Log.DebugFormat("cryptogram_enc: {0}", HexConverter.ConvertToHexString(cryptogram_enc)); _IV = ExtractLastBlock(cryptogram_enc, 16); - _Log.DebugFormat("_IV: {0}", ConvertToHexString(_IV)); + _Log.DebugFormat("_IV: {0}", HexConverter.ConvertToHexString(_IV)); byte[] data = Concatenate(new byte[] { key_id }, cryptogram_enc); - _Log.DebugFormat("data: {0}", ConvertToHexString(data)); + _Log.DebugFormat("data: {0}", HexConverter.ConvertToHexString(data)); APDUCommand cmd_ChangeKey = new APDUCommand(IsoCase.Case4Short) { @@ -797,10 +789,10 @@ namespace NFC.Mifare_DESFire INS = 0xC4, Data = data }; - _Log.DebugFormat("APDU_CMD(cmd_ChangeKey): {0}", ConvertToHexString(cmd_ChangeKey.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_ChangeKey): {0}", HexConverter.ConvertToHexString(cmd_ChangeKey.ToArray())); APDUResponse response = _Card.Transmit(cmd_ChangeKey); - _Log.DebugFormat("APDU_RES(cmd_ChangeKey): {0}", ConvertToHexString(response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_ChangeKey): {0}", HexConverter.ConvertToHexString(response.ToArray())); CheckAPDUResponse(response); @@ -821,37 +813,37 @@ namespace NFC.Mifare_DESFire { 0xC4, key_id }; - _Log.DebugFormat("header: {0}", ConvertToHexString(header)); + _Log.DebugFormat("header: {0}", HexConverter.ConvertToHexString(header)); byte[] key_xor = XOR(new_key, old_key); // AES Key Version is Append to Key byte[] key_and_version = Concatenate(key_xor, new byte[] { key_version }); byte[] command = Concatenate(header, key_and_version); - _Log.DebugFormat("command: {0}", ConvertToHexString(command)); + _Log.DebugFormat("command: {0}", HexConverter.ConvertToHexString(command)); CRC32 crc32 = new CRC32(); byte[] crc_cmd = crc32.Calculate(command); - _Log.DebugFormat("crc_cmd: {0}", ConvertToHexString(crc_cmd)); + _Log.DebugFormat("crc_cmd: {0}", HexConverter.ConvertToHexString(crc_cmd)); byte[] crc_key = crc32.Calculate(new_key); - _Log.DebugFormat("crc_key: {0}", ConvertToHexString(crc_key)); + _Log.DebugFormat("crc_key: {0}", HexConverter.ConvertToHexString(crc_key)); byte[] cryptogram = Concatenate(key_and_version, crc_cmd); cryptogram = Concatenate(cryptogram, crc_key); - _Log.DebugFormat("cryptogram: {0}", ConvertToHexString(cryptogram)); + _Log.DebugFormat("cryptogram: {0}", HexConverter.ConvertToHexString(cryptogram)); byte[] cryptogram_block = ExpandToBlockSize(cryptogram, 16); - _Log.DebugFormat("cryptogram_block: {0}", ConvertToHexString(cryptogram_block)); + _Log.DebugFormat("cryptogram_block: {0}", HexConverter.ConvertToHexString(cryptogram_block)); AES aes = new AES(); byte[] cryptogram_enc = aes.Encrypt(cryptogram_block, _SessionKey, _IV); - _Log.DebugFormat("cryptogram_enc: {0}", ConvertToHexString(cryptogram_enc)); + _Log.DebugFormat("cryptogram_enc: {0}", HexConverter.ConvertToHexString(cryptogram_enc)); _IV = ExtractLastBlock(cryptogram_enc, 16); - _Log.DebugFormat("_IV: {0}", ConvertToHexString(_IV)); + _Log.DebugFormat("_IV: {0}", HexConverter.ConvertToHexString(_IV)); byte[] data = Concatenate(new byte[] { key_id }, cryptogram_enc); - _Log.DebugFormat("data: {0}", ConvertToHexString(data)); + _Log.DebugFormat("data: {0}", HexConverter.ConvertToHexString(data)); APDUCommand cmd_ChangeKey = new APDUCommand(IsoCase.Case4Short) { @@ -859,10 +851,10 @@ namespace NFC.Mifare_DESFire INS = 0xC4, Data = data }; - _Log.DebugFormat("APDU_CMD(cmd_ChangeKey): {0}", ConvertToHexString(cmd_ChangeKey.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_ChangeKey): {0}", HexConverter.ConvertToHexString(cmd_ChangeKey.ToArray())); APDUResponse response = _Card.Transmit(cmd_ChangeKey); - _Log.DebugFormat("APDU_RES(cmd_ChangeKey): {0}", ConvertToHexString(response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_ChangeKey): {0}", HexConverter.ConvertToHexString(response.ToArray())); CheckAPDUResponse(response); @@ -904,10 +896,10 @@ namespace NFC.Mifare_DESFire INS = (byte)APDUInstructions.CREATE_STDDATAFILE, Data = Concatenate(data, accessRights_byte, size_byte) }; - _Log.DebugFormat("APDU_CMD(cmd_CreateFile_Standard): {0}", ConvertToHexString(cmd_CreateFile_Standard.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_CreateFile_Standard): {0}", HexConverter.ConvertToHexString(cmd_CreateFile_Standard.ToArray())); APDUResponse response = _Card.Transmit(cmd_CreateFile_Standard); - _Log.DebugFormat("APDU_RES(cmd_CreateFile_Standard): {0}", ConvertToHexString(response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_CreateFile_Standard): {0}", HexConverter.ConvertToHexString(response.ToArray())); CheckAPDUResponse(response); @@ -924,7 +916,7 @@ namespace NFC.Mifare_DESFire { _Log.Debug("Start ReadData"); - int max_read_bytes_pre_transaction = 58; + int max_read_bytes_pre_transaction = 47; long bytes_readed = 0; List read_data = new List(); @@ -973,10 +965,10 @@ namespace NFC.Mifare_DESFire INS = (byte)APDUInstructions.READ_DATA, Data = Concatenate(data, offset_byte, length_byte) }; - _Log.DebugFormat("APDU_CMD(cmd_ReadData): {0}", ConvertToHexString(cmd_ReadData.ToArray())); + _Log.DebugFormat("APDU_CMD(cmd_ReadData): {0}", HexConverter.ConvertToHexString(cmd_ReadData.ToArray())); APDUResponse response = _Card.Transmit(cmd_ReadData); - _Log.DebugFormat("APDU_RES(cmd_ReadData): {0}", ConvertToHexString(response.ToArray())); + _Log.DebugFormat("APDU_RES(cmd_ReadData): {0}", HexConverter.ConvertToHexString(response.ToArray())); CheckAPDUResponse(response); read_data.AddRange(response.Body); @@ -996,119 +988,69 @@ namespace NFC.Mifare_DESFire { _Log.Debug("Start WriteData"); - byte[] file_id_array = new byte[] - { - file_id - }; + int max_write_bytes_pre_transaction = 47; + byte[] write_buffer; - byte[] offset_byte_tolong = BitConverter.GetBytes(offset); - // Use only 3 Bytes - byte[] offset_byte = new byte[] + long bytes_writed = 0; + long length = data.Length; + + while (bytes_writed != data.Length) { + byte[] file_id_array = new byte[] + { + file_id + }; + + byte[] offset_byte_tolong = BitConverter.GetBytes(offset + bytes_writed); + // Use only 3 Bytes + byte[] offset_byte = new byte[] + { offset_byte_tolong[0], offset_byte_tolong[1], offset_byte_tolong[2], - }; + }; - byte[] lenght_byte_tolong = BitConverter.GetBytes(data.Length); - // Use only 3 Bytes - byte[] lenght_byte = new byte[] - { - lenght_byte_tolong[0], - lenght_byte_tolong[1], - lenght_byte_tolong[2], - }; + long bytes_towrite = 0; - APDUCommand cmd_WriteData = new APDUCommand(IsoCase.Case4Short) - { - CLA = 0x90, - INS = (byte)APDUInstructions.WRITE_DATA, - Data = Concatenate(file_id_array, offset_byte, lenght_byte, data) - }; - _Log.DebugFormat("APDU_CMD(cmd_WriteData): {0}", ConvertToHexString(cmd_WriteData.ToArray())); + if (length - bytes_writed < max_write_bytes_pre_transaction) + { + bytes_towrite = length - bytes_writed; + } + else + { + bytes_towrite = max_write_bytes_pre_transaction; + } - APDUResponse response = _Card.Transmit(cmd_WriteData); - _Log.DebugFormat("APDU_RES(cmd_WriteData): {0}", ConvertToHexString(response.ToArray())); + byte[] length_byte_tolong = BitConverter.GetBytes(bytes_towrite); - CheckAPDUResponse(response); + write_buffer = GetSubArray(data, bytes_writed, bytes_towrite); + bytes_writed += bytes_towrite; + + // Use only 3 Bytes + byte[] length_byte = new byte[] + { + length_byte_tolong[0], + length_byte_tolong[1], + length_byte_tolong[2], + }; + + APDUCommand cmd_WriteData = new APDUCommand(IsoCase.Case4Short) + { + CLA = 0x90, + INS = (byte)APDUInstructions.WRITE_DATA, + Data = Concatenate(file_id_array, offset_byte, length_byte, write_buffer) + }; + _Log.DebugFormat("APDU_CMD(cmd_WriteData): {0}", HexConverter.ConvertToHexString(cmd_WriteData.ToArray())); + + APDUResponse response = _Card.Transmit(cmd_WriteData); + _Log.DebugFormat("APDU_RES(cmd_WriteData): {0}", HexConverter.ConvertToHexString(response.ToArray())); + + CheckAPDUResponse(response); + } _Log.Debug("End WriteData"); } - - ///// - ///// Write Data to File - ///// - ///// ID of File (0x01 - 0x10) - ///// Offset for File - ///// Data to write - //public void WriteData(byte file_id, UInt32 offset, byte[] data) - //{ - // _Log.Debug("Start WriteData"); - - // int max_write_bytes_pre_transaction = 8; - // byte[] write_buffer; - - // long bytes_writed = 0; - // long length = data.Length; - - // while (bytes_writed != data.Length) - // { - // byte[] file_id_array = new byte[] - // { - // file_id - // }; - - // byte[] offset_byte_tolong = BitConverter.GetBytes(offset + bytes_writed); - // // Use only 3 Bytes - // byte[] offset_byte = new byte[] - // { - // offset_byte_tolong[0], - // offset_byte_tolong[1], - // offset_byte_tolong[2], - // }; - - // long bytes_towrite = 0; - - // if (length - bytes_writed < max_write_bytes_pre_transaction) - // { - // bytes_towrite = length - bytes_writed; - // } - // else - // { - // bytes_towrite = max_write_bytes_pre_transaction; - // } - - // byte[] length_byte_tolong = BitConverter.GetBytes(bytes_towrite); - - // write_buffer = GetSubArray(data, bytes_writed, bytes_towrite); - // bytes_writed += bytes_towrite; - - // // Use only 3 Bytes - // byte[] length_byte = new byte[] - // { - // length_byte_tolong[0], - // length_byte_tolong[1], - // length_byte_tolong[2], - // }; - - // APDUCommand cmd_WriteData = new APDUCommand(IsoCase.Case4Short) - // { - // CLA = 0x90, - // INS = (byte)APDUInstructions.WRITE_DATA, - // Data = Concatenate(file_id_array, offset_byte, length_byte, write_buffer) - // }; - // _Log.DebugFormat("APDU_CMD(cmd_WriteData): {0}", ConvertToHexString(cmd_WriteData.ToArray())); - - // APDUResponse response = _Card.Transmit(cmd_WriteData); - // _Log.DebugFormat("APDU_RES(cmd_WriteData): {0}", ConvertToHexString(response.ToArray())); - - // CheckAPDUResponse(response); - // } - - // _Log.Debug("End WriteData"); - //} - /// /// Get all ApplicationIDS from PICC /// @@ -1176,63 +1118,6 @@ namespace NFC.Mifare_DESFire // CheckAPDUResponse(response); //} #endregion - - #region Configuration Generator - /// - /// Genearte KeySetting1 for Application Settings or PICC Setting - /// - public byte GenerateKeySetting1(ChangeApplicationKey changeKey, ChangeMasterKeySettings changeMasterKeySettings, CreateDeleteFile createDeleteFile, FileDirectoryAccess fileDirectoryAccess, ChangeMasterKey changeMasterKey) - { - return (byte)(((byte)changeKey << 4) | (byte)changeMasterKeySettings | (byte)createDeleteFile | (byte)fileDirectoryAccess | (byte)changeMasterKey); - } - - /// - /// Genearte KeySetting1 for Application Settings or PICC Setting - /// - /// ID of Key for changing Application Keys - /// - public byte GenerateKeySetting1(byte changeKey, ChangeMasterKeySettings changeMasterKeySettings, CreateDeleteFile createDeleteFile, FileDirectoryAccess fileDirectoryAccess, ChangeMasterKey changeMasterKey) - { - if (changeKey < 0x01 || changeKey >= 0x0E) - { - throw new ArgumentOutOfRangeException(); - } - return GenerateKeySetting1(changeKey, changeMasterKeySettings, createDeleteFile, fileDirectoryAccess, changeMasterKey); - } - - /// - /// Genearte KeySetting2 for Application Creation - /// - /// Number of keys that can be stored within the application (0x01-0x0D) - /// - public byte GenerateKeySetting2(CryptoOperationsType cryptoOperations, FileIdentifies fileIdentifies, byte numberOfKeys) - { - if (numberOfKeys < 0x01 || numberOfKeys >= 0x0D) - { - throw new ArgumentOutOfRangeException(); - } - - return (byte)((byte)cryptoOperations | (byte)fileIdentifies | numberOfKeys); - } - - /// - /// Generate FileAccess Rights for File Settings - /// Use enum AccesRights for Free or Never Option - /// - /// KeyID for Read Access - /// KeyID for Write Access - /// KeyID for Read and Write Access - /// KeyID for Configuration Access - public UInt16 GenerateFileAccessRights(byte read, byte write, byte read_write, byte configure) - { - if(read > 0x0F || write > 0x0F || read_write > 0x0F || configure > 0x0F) - { - throw new ArgumentOutOfRangeException("One KeyID is not valid"); - } - - return (UInt16)((read << 12) | (write << 8) | (read_write << 4) | configure); - } - #endregion #endregion } } diff --git a/NFC/Readers/PCSC/Hardware.cs b/NFC/Readers/PCSC/PCSC_Hardware.cs similarity index 87% rename from NFC/Readers/PCSC/Hardware.cs rename to NFC/Readers/PCSC/PCSC_Hardware.cs index efc2373..3f86805 100644 --- a/NFC/Readers/PCSC/Hardware.cs +++ b/NFC/Readers/PCSC/PCSC_Hardware.cs @@ -2,7 +2,7 @@ namespace NFC.Readers.PCSC { - public class Hardware : IHardware + public class PCSC_Hardware : IHardware { public string[] GetReaders() { @@ -27,7 +27,7 @@ namespace NFC.Readers.PCSC public IReader OpenReader(string readerID) { - return new Reader(readerID); + return new PCSC_Reader(readerID); } } } diff --git a/NFC/Readers/PCSC/Reader.cs b/NFC/Readers/PCSC/PCSC_Reader.cs similarity index 88% rename from NFC/Readers/PCSC/Reader.cs rename to NFC/Readers/PCSC/PCSC_Reader.cs index dfb440d..c0a399c 100644 --- a/NFC/Readers/PCSC/Reader.cs +++ b/NFC/Readers/PCSC/PCSC_Reader.cs @@ -1,13 +1,11 @@ using PCSC; using PCSC.Iso7816; using System; -using System.Collections.Generic; -using System.Text; namespace NFC.Readers.PCSC { - public class Reader : IReader, IDisposable + public class PCSC_Reader : IReader, IDisposable { private string _ReaderID; private IContextFactory _ContextFactory; @@ -15,7 +13,7 @@ namespace NFC.Readers.PCSC private IsoReader _ISOReader; private ICard _Card; - public Reader(string readerID) + public PCSC_Reader(string readerID) { _ReaderID = readerID; } diff --git a/NFC_Test/Crypto/AES_Test.cs b/NFC_Test/Crypto/AES_Test.cs index a4a2cf0..df41197 100644 --- a/NFC_Test/Crypto/AES_Test.cs +++ b/NFC_Test/Crypto/AES_Test.cs @@ -1,8 +1,8 @@ -using NFC.Crypto; -using NFC.Mifare_DESFire; +using NFC; +using NFC.Crypto; using NUnit.Framework; -namespace NFC_Test.Crypto +namespace NFC_Unit_Test.Crypto { [TestFixture] public class AES_Test @@ -10,16 +10,14 @@ namespace NFC_Test.Crypto [Test] public void Encrypt() { - MIFARE_DESFire desfire = new MIFARE_DESFire(null); - - byte[] data = desfire.ConvertFromHexString("8db1f942f2d7cc82f6fa1486a30f8c12104a3b07e8eb77a7ac00000000000000"); - byte[] key = desfire.ConvertFromHexString("e7aff3361c3e85347993c3219a87d24b"); - byte[] iv = desfire.ConvertFromHexString("00000000000000000000000000000000"); + byte[] data = HexConverter.ConvertFromHexString("8db1f942f2d7cc82f6fa1486a30f8c12104a3b07e8eb77a7ac00000000000000"); + byte[] key = HexConverter.ConvertFromHexString("e7aff3361c3e85347993c3219a87d24b"); + byte[] iv = HexConverter.ConvertFromHexString("00000000000000000000000000000000"); AES aes = new AES(); byte[] data_enc = aes.Encrypt(data, key, iv); - byte[] data_enc_expected = desfire.ConvertFromHexString("3c79d74a4969ba7123e5d8f6df24493112d221fd131a4617d0eda5d92ccc1b46"); + byte[] data_enc_expected = HexConverter.ConvertFromHexString("3c79d74a4969ba7123e5d8f6df24493112d221fd131a4617d0eda5d92ccc1b46"); Assert.AreEqual(data_enc_expected, data_enc); } } diff --git a/NFC_Test/Crypto/CRC16_Test.cs b/NFC_Test/Crypto/CRC16_Test.cs index d174e05..3098f35 100644 --- a/NFC_Test/Crypto/CRC16_Test.cs +++ b/NFC_Test/Crypto/CRC16_Test.cs @@ -2,7 +2,7 @@ using NFC.Crypto; using NUnit.Framework; -namespace NFC_Test.Crypto +namespace NFC_Unit_Test.Crypto { [TestFixture] public class CRC16_Test diff --git a/NFC_Test/Crypto/CRC32_Test.cs b/NFC_Test/Crypto/CRC32_Test.cs index aa14248..f2ce5a8 100644 --- a/NFC_Test/Crypto/CRC32_Test.cs +++ b/NFC_Test/Crypto/CRC32_Test.cs @@ -2,7 +2,7 @@ using NFC.Crypto; using NUnit.Framework; -namespace NFC_Test.Crypto +namespace NFC_Unit_Test.Crypto { [TestFixture] public class CRC32_Test diff --git a/NFC_Test/Crypto/CipherKey_Test.cs b/NFC_Test/Crypto/CipherKey_Test.cs new file mode 100644 index 0000000..492d2d1 --- /dev/null +++ b/NFC_Test/Crypto/CipherKey_Test.cs @@ -0,0 +1,13 @@ +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; + +namespace NFC_Unit_Test.Crypto +{ + [TestFixture] + public class CipherKey_Test + { + + } +} diff --git a/NFC_Test/Crypto/TDES_Test.cs b/NFC_Test/Crypto/TDES_Test.cs index 3789040..fbf8ba0 100644 --- a/NFC_Test/Crypto/TDES_Test.cs +++ b/NFC_Test/Crypto/TDES_Test.cs @@ -1,8 +1,8 @@ -using NFC.Crypto; -using NFC.Mifare_DESFire; +using NFC; +using NFC.Crypto; using NUnit.Framework; -namespace NFC_Test.Crypto +namespace NFC_Unit_Test.Crypto { [TestFixture] public class TDES_Test @@ -11,16 +11,14 @@ namespace NFC_Test.Crypto [Ignore("Unknown Expected Data")] public void Encrypt_TDES() { - MIFARE_DESFire desfire = new MIFARE_DESFire(null); - - byte[] data = desfire.ConvertFromHexString(""); - byte[] key = desfire.ConvertFromHexString(""); - byte[] iv = desfire.ConvertFromHexString("0000000000000000"); + byte[] data = HexConverter.ConvertFromHexString(""); + byte[] key = HexConverter.ConvertFromHexString(""); + byte[] iv = HexConverter.ConvertFromHexString("0000000000000000"); TDES des = new TDES(); byte[] data_enc = des.Encrypt(data, key, iv); - byte[] data_enc_expected = desfire.ConvertFromHexString(""); + byte[] data_enc_expected = HexConverter.ConvertFromHexString(""); Assert.AreEqual(data_enc_expected, data_enc); } @@ -28,16 +26,14 @@ namespace NFC_Test.Crypto [Ignore("Unknown Expected Data")] public void Encrypt_TDES_2K() { - MIFARE_DESFire desfire = new MIFARE_DESFire(null); - - byte[] data = desfire.ConvertFromHexString(""); - byte[] key = desfire.ConvertFromHexString(""); - byte[] iv = desfire.ConvertFromHexString("0000000000000000"); + byte[] data = HexConverter.ConvertFromHexString(""); + byte[] key = HexConverter.ConvertFromHexString(""); + byte[] iv = HexConverter.ConvertFromHexString("0000000000000000"); TDES_2K des = new TDES_2K(); byte[] data_enc = des.Encrypt(data, key, iv); - byte[] data_enc_expected = desfire.ConvertFromHexString(""); + byte[] data_enc_expected = HexConverter.ConvertFromHexString(""); Assert.AreEqual(data_enc_expected, data_enc); } @@ -45,16 +41,14 @@ namespace NFC_Test.Crypto [Ignore("Unknown Expected Data")] public void Encrypt_TDES_3K() { - MIFARE_DESFire desfire = new MIFARE_DESFire(null); - - byte[] data = desfire.ConvertFromHexString(""); - byte[] key = desfire.ConvertFromHexString(""); - byte[] iv = desfire.ConvertFromHexString("0000000000000000"); + byte[] data = HexConverter.ConvertFromHexString(""); + byte[] key = HexConverter.ConvertFromHexString(""); + byte[] iv = HexConverter.ConvertFromHexString("0000000000000000"); TDES_3K des = new TDES_3K(); byte[] data_enc = des.Encrypt(data, key, iv); - byte[] data_enc_expected = desfire.ConvertFromHexString(""); + byte[] data_enc_expected = HexConverter.ConvertFromHexString(""); Assert.AreEqual(data_enc_expected, data_enc); } } diff --git a/NFC_Test/HexConverter_Test.cs b/NFC_Test/HexConverter_Test.cs index fba4be6..f20669c 100644 --- a/NFC_Test/HexConverter_Test.cs +++ b/NFC_Test/HexConverter_Test.cs @@ -1,7 +1,7 @@ using NFC; using NUnit.Framework; -namespace NFC_Test +namespace NFC_Unit_Test { public class HexConverter_Test { diff --git a/NFC_Test/ISO7816-4/APDUCommand_Test.cs b/NFC_Test/ISO7816-4/APDUCommand_Test.cs index 28c68e1..1688aea 100644 --- a/NFC_Test/ISO7816-4/APDUCommand_Test.cs +++ b/NFC_Test/ISO7816-4/APDUCommand_Test.cs @@ -3,7 +3,7 @@ using NFC.ISO7816_4; using NUnit.Framework; using PCSC.Iso7816; -namespace NFC_Test.ISO7816_4 +namespace NFC_Unit_Test.ISO7816_4 { [TestFixture] public class APDUCommand_Test diff --git a/NFC_Test/NXP MIFARE DESFire/Command_Card_Test.cs b/NFC_Test/NXP MIFARE DESFire/Command_Card_Test.cs deleted file mode 100644 index 92e2c21..0000000 --- a/NFC_Test/NXP MIFARE DESFire/Command_Card_Test.cs +++ /dev/null @@ -1,308 +0,0 @@ -using NFC; -using NFC.Crypto; -using NFC.Mifare_DESFire; -using NFC.Readers.PCSC; -using NUnit.Framework; -using NUnit.Framework.Constraints; -using System; -using System.Collections.Generic; -using System.Text; - -namespace NFC_Test.NXP_MIFARE_DESFire -{ - /// - /// Test all DESFire Commands with empty Card - /// - [Description("Test with real DESFire Card")] - [Explicit] - public class Command_Card_Test - { - public readonly string ReaderID = ""; - public readonly UInt32 AID = 0xAAFFEE; - public readonly string AES_Key_Master = "25432A462D4A614E645267556B587032"; - public readonly string AES_Key_1 = "50645367566B59703373367638792F42"; - - /// - /// Get ReaderIDs form PC/SC API - /// - [Test] - public void GetReaderIDs() - { - IHardware hardware = new Hardware(); - string[] readers = hardware.GetReaders(); - - Console.WriteLine("Readers detected: {0}", readers.Length); - - if (readers.Length > 0) - { - Console.WriteLine("List of ReaderIDs:"); - foreach (string readerID in readers) - { - Console.WriteLine("{0}", readerID); - } - } - } - - [Test] - public void Connect() - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(ReaderID); - - bool connected_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - connected_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, connected_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - - [Test] - public void Format() - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(ReaderID); - - bool test_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - MIFARE_DESFire desfire = new MIFARE_DESFire(card); - - desfire.Format(); - - test_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, test_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - - [Test] - public void SelectApplication() - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(ReaderID); - - bool test_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - MIFARE_DESFire desfire = new MIFARE_DESFire(card); - - desfire.SelectApplication(0x000000); - - test_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, test_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - - [Test] - public void Authenticate_DES() - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(ReaderID); - - bool test_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - MIFARE_DESFire desfire = new MIFARE_DESFire(card); - - desfire.SelectApplication(0x000000); - - CipherKey key = new CipherKey(CipherType.TDES); - desfire.AuthenticateISO_DES(0x00, key._Key); - - test_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, test_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - - - [Test] - public void CreateApplication() - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(ReaderID); - - bool test_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - MIFARE_DESFire desfire = new MIFARE_DESFire(card); - - CipherKey key = new CipherKey(CipherType.TDES); - desfire.AuthenticateISO_DES(0x00, key._Key); - - byte keysetting1 = desfire.GenerateKeySetting1(NFC.Mifare_DESFire.Enums.ChangeApplicationKey.ALLKEYS, NFC.Mifare_DESFire.Enums.ChangeMasterKeySettings.WITHMASTERKEY, NFC.Mifare_DESFire.Enums.CreateDeleteFile.NOKEY, NFC.Mifare_DESFire.Enums.FileDirectoryAccess.NOKEY, NFC.Mifare_DESFire.Enums.ChangeMasterKey.CHANGEABLE); - byte keysetting2 = desfire.GenerateKeySetting2(NFC.Mifare_DESFire.Enums.CryptoOperationsType.AES, NFC.Mifare_DESFire.Enums.FileIdentifies.NOTUSED, 2); - - desfire.CreateApplication(AID, keysetting1, keysetting2); - - test_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, test_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - - [Test] - public void Authenticate_AES() - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(ReaderID); - - bool test_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - MIFARE_DESFire desfire = new MIFARE_DESFire(card); - - desfire.SelectApplication(AID); - - CipherKey key = new CipherKey(CipherType.AES); - desfire.AuthenticateISO_AES(0x00, key._Key); - - test_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, test_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - - [Test] - public void ChangeApplicationMasterKey() - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(ReaderID); - - bool test_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - MIFARE_DESFire desfire = new MIFARE_DESFire(card); - - desfire.SelectApplication(AID); - - CipherKey key_default = new CipherKey(CipherType.AES); - desfire.AuthenticateISO_AES(0x00, key_default._Key); - - CipherKey key = new CipherKey(AES_Key_Master, CipherType.AES, 0x10); - desfire.ChangeKey_AES(0x00, key._Key, key._KeyVersion); - - test_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, test_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - - [Test] - public void ChangeApplicationKey_1() - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(ReaderID); - - bool test_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - MIFARE_DESFire desfire = new MIFARE_DESFire(card); - - desfire.SelectApplication(AID); - - CipherKey key_master = new CipherKey(AES_Key_Master, CipherType.AES, 0x10); - desfire.AuthenticateISO_AES(0x00, key_master._Key); - - CipherKey key_old = new CipherKey(AES_Key_1, CipherType.AES, 0x10); - CipherKey key_new = new CipherKey(AES_Key_1, CipherType.AES, 0x10); - desfire.ChangeOtherKey_AES(0x01, key_new._Key, key_old._Key, key_new._KeyVersion); - - test_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, test_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - } -} diff --git a/NFC_Test/NXP MIFARE DESFire/Command_Test.cs b/NFC_Test/NXP MIFARE DESFire/Command_Test.cs deleted file mode 100644 index f154e3f..0000000 --- a/NFC_Test/NXP MIFARE DESFire/Command_Test.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace NFC_Test.NXP_MIFARE_DESFire -{ - class Command_Test - { - } -} diff --git a/NFC_Test/NXP MIFARE DESFire/MIFARE_DESFire_Test.cs b/NFC_Test/NXP MIFARE DESFire/MIFARE_DESFire_Test.cs index 0a1b6d5..22de52a 100644 --- a/NFC_Test/NXP MIFARE DESFire/MIFARE_DESFire_Test.cs +++ b/NFC_Test/NXP MIFARE DESFire/MIFARE_DESFire_Test.cs @@ -1,4 +1,5 @@ using NFC; +using NFC.Mifare_DESFire.Enums; using NFC.ISO7816_4; using NFC.Mifare_DESFire; using NFC.NXP_MIFARE_DESFire.Exceptions; @@ -6,30 +7,48 @@ using NSubstitute; using NUnit.Framework; using System; -namespace NFC_Test.NXP_MIFARE_DESFire +namespace NFC_Unit_Test.NXP_MIFARE_DESFire { [TestFixture] public class MIFARE_DESFire_Test { #region Helper Methods [Test] - public void GenerateDefaultKey() + public void GenerateEmptyArray() { uint i = 16; MIFARE_DESFire desfire = new MIFARE_DESFire(null); - byte[] data = desfire.GenerateEmptyKey(i); + byte[] data = desfire.GenerateEmptyArray(i); - for(int e = 0; e < i; e++) + for (int e = 0; e < i; e++) { - if(data[e] != 0x00) + if (data[e] != 0x00) { Assert.Fail("Data is not 0x00"); } } } + [Test] + public void GetSubArray() + { + byte[] array = new byte[] + { + 0x01, 0x02, 0x03, 0x04, 0x05 + }; + + byte[] expected_subarray = new byte[] + { + 0x02, 0x03, 0x04 + }; + + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + Assert.AreEqual(expected_subarray, desfire.GetSubArray(array, 1, 3)); + } + [Test] public void CheckAPDUResponse__NULL() { @@ -175,7 +194,6 @@ namespace NFC_Test.NXP_MIFARE_DESFire }); } - [Test] public void CheckAPDUResponse__PARAMETER_ERROR() { @@ -194,7 +212,6 @@ namespace NFC_Test.NXP_MIFARE_DESFire }); } - [Test] public void CheckAPDUResponse__AUTHENTICATION_DELAY() { @@ -370,6 +387,40 @@ namespace NFC_Test.NXP_MIFARE_DESFire }); } + [Test] + public void ExpandToBlockSize() + { + byte[] data = new byte[] + { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + }; + + byte[] expected_lastblock = new byte[] + { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 + }; + + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + byte[] lastblock = desfire.ExpandToBlockSize(data, 8); + + Assert.AreEqual(expected_lastblock, lastblock); + } + + [Test] + public void ExpandToBlockSize_Null() + { + byte[] data = null; + + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + Assert.Throws( + delegate + { + byte[] lastblock = desfire.ExpandToBlockSize(data, 8); + }); + } + [Test] public void RotateLeft() { @@ -538,25 +589,113 @@ namespace NFC_Test.NXP_MIFARE_DESFire }); } + [Test] + public void GenerateSessionKey_DES() + { + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + byte[] rndA = HexConverter.ConvertFromHexString("a541a9dc9138df07"); + Console.WriteLine(HexConverter.ConvertToHexString(rndA)); + byte[] rndB = HexConverter.ConvertFromHexString("cbe55aa893b2da25"); + Console.WriteLine(HexConverter.ConvertToHexString(rndB)); + + byte[] expected_sessionkey = HexConverter.ConvertFromHexString("a541a9dccbe55aa8a541a9dccbe55aa8"); + Console.WriteLine(HexConverter.ConvertToHexString(expected_sessionkey)); + + byte[] sessionkey = desfire.GenerateSesionKey_DES(rndA, rndB); + Console.WriteLine(HexConverter.ConvertToHexString(sessionkey)); + Assert.AreEqual(expected_sessionkey, sessionkey); + } + [Test] public void GenerateSessionKey_AES() { MIFARE_DESFire desfire = new MIFARE_DESFire(null); - byte[] rndA = desfire.ConvertFromHexString("bc14dfde20074617e45a8822f06fdd91"); - Console.WriteLine(desfire.ConvertToHexString(rndA)); - byte[] rndB = desfire.ConvertFromHexString("482ddc54426e6dee560413b8d95471f5"); - Console.WriteLine(desfire.ConvertToHexString(rndB)); + byte[] rndA = HexConverter.ConvertFromHexString("bc14dfde20074617e45a8822f06fdd91"); + Console.WriteLine(HexConverter.ConvertToHexString(rndA)); + byte[] rndB = HexConverter.ConvertFromHexString("482ddc54426e6dee560413b8d95471f5"); + Console.WriteLine(HexConverter.ConvertToHexString(rndB)); - byte[] expected_sessionkey = desfire.ConvertFromHexString("bc14dfde482ddc54f06fdd91d95471f5"); - Console.WriteLine(desfire.ConvertToHexString(expected_sessionkey)); + byte[] expected_sessionkey = HexConverter.ConvertFromHexString("bc14dfde482ddc54f06fdd91d95471f5"); + Console.WriteLine(HexConverter.ConvertToHexString(expected_sessionkey)); byte[] sessionkey = desfire.GenerateSesionKey_AES(rndA, rndB); - Console.WriteLine(desfire.ConvertToHexString(sessionkey)); + Console.WriteLine(HexConverter.ConvertToHexString(sessionkey)); Assert.AreEqual(expected_sessionkey, sessionkey); } #endregion + #region Configuration Generator + [Test] + public void GenerateKeySetting1() + { + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + Assert.AreEqual(0x0B, desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE)); + } + + [Test] + public void GenerateKeySetting1_ChangeKey() + { + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + Assert.AreEqual(0x1B, desfire.GenerateKeySetting1(0x01, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE)); + } + + [Test] + public void GenerateKeySetting1_Wrong_KeyID() + { + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + Assert.Throws( + delegate + { + desfire.GenerateKeySetting1(0x10, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE); + }); + } + + [Test] + public void GenerateKeySetting2() + { + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + Assert.AreEqual(0x82, desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 0x02)); + } + + [Test] + public void GenerateKeySetting2_Wrong_KeyNumbers() + { + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + Assert.Throws( + delegate + { + desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 0x10); + }); + } + + + [Test] + public void GenerateFileAccessRights() + { + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + Assert.AreEqual(0x1234, desfire.GenerateFileAccessRights(0x01, 0x02, 0x03, 0x04)); + } + + [Test] + public void GenerateFileAccessRights_OutOfRange() + { + MIFARE_DESFire desfire = new MIFARE_DESFire(null); + + Assert.Throws( + delegate + { + desfire.GenerateFileAccessRights(0x10, 0x00, 0x00, 0x00); + }); + } + #endregion + #region DESFire Commands [Test] public void AuthenticateISO_DES() @@ -588,7 +727,7 @@ namespace NFC_Test.NXP_MIFARE_DESFire desfire.AuthenticateISO_DES(0x00, key, rndA); byte[] expected_sessionkey = HexConverter.ConvertFromHexString("849B36C54FD1B759849B36C54FD1B759"); - byte[] expected_iv = desfire.GenerateEmptyKey(8); + byte[] expected_iv = HexConverter.ConvertFromHexString("0000000000000000"); Assert.AreEqual(expected_sessionkey, desfire._SessionKey); Assert.AreEqual(expected_iv, desfire._IV); @@ -624,7 +763,7 @@ namespace NFC_Test.NXP_MIFARE_DESFire desfire.AuthenticateISO_AES(0x00, key, rndA); byte[] expected_sessionkey = HexConverter.ConvertFromHexString("8a8b3c15c71d0cf46aead1f148f27703"); - byte[] expected_iv = desfire.GenerateEmptyKey(16); + byte[] expected_iv = HexConverter.ConvertFromHexString("00000000000000000000000000000000"); Assert.AreEqual(expected_sessionkey, desfire._SessionKey); Assert.AreEqual(expected_iv, desfire._IV); @@ -683,27 +822,5 @@ namespace NFC_Test.NXP_MIFARE_DESFire desfire.ChangeOtherKey_AES(0x01, new_key, old_key, 0x10); } #endregion - - #region Configuration Generator - [Test] - public void GenerateFileAccessRights() - { - MIFARE_DESFire desfire = new MIFARE_DESFire(null); - - Assert.AreEqual(0x1234, desfire.GenerateFileAccessRights(0x01, 0x02, 0x03, 0x04)); - } - - [Test] - public void GenerateFileAccessRights_OutOfRange() - { - MIFARE_DESFire desfire = new MIFARE_DESFire(null); - - Assert.Throws( - delegate - { - desfire.GenerateFileAccessRights(0x10, 0x00, 0x00, 0x00); - }); - } - #endregion } } diff --git a/NFC_Test/NamespaceSetUp.cs b/NFC_Test/NamespaceSetUp.cs index eb86856..64b4adc 100644 --- a/NFC_Test/NamespaceSetUp.cs +++ b/NFC_Test/NamespaceSetUp.cs @@ -1,8 +1,11 @@ using log4net.Config; using NUnit.Framework; -namespace NFC_Test +namespace NFC_Unit_Test { + /// + /// Add log4net Output to Console Out + /// [SetUpFixture] public class NamespaceSetUp { @@ -13,3 +16,19 @@ namespace NFC_Test } } } + +namespace NFC_Real_Test +{ + /// + /// Add log4net Output to Console Out + /// + [SetUpFixture] + public class NamespaceSetUp + { + [OneTimeSetUp] + public void OneTimeSetUp() + { + BasicConfigurator.Configure(); + } + } +} diff --git a/NFC_Test/REAL_DESFireCommands.cs b/NFC_Test/REAL_DESFireCommands.cs new file mode 100644 index 0000000..36bd22f --- /dev/null +++ b/NFC_Test/REAL_DESFireCommands.cs @@ -0,0 +1,477 @@ +using NFC; +using NFC.Crypto; +using NFC.Mifare_DESFire; +using NFC.Mifare_DESFire.Enums; +using NFC.Readers.PCSC; +using NUnit.Framework; +using System; +using System.Text; + +namespace NFC_Real_Test +{ + /// + /// Test all DESFire Commands with an Empty Card + /// The Test are ordered to check the Commands one by one + /// + [TestFixture, Explicit] + public class REAL_DESFireCommands + { + /// + /// Set ReaderID for PCSC Interface + /// You can get the ID from REAL_Reader_PCSC + /// + public readonly string ReaderID = "ACS ACR122U PICC Interface 0"; + + #region Fixed Config Properties + public readonly UInt32 ApplicationID = 0xAAFFEE; + public readonly string ApplicationMasterKey = "25432A462D4A614E645267556B587032"; + public readonly string ApplicationKey_1 = "25432A462D4A614E645267556B587032"; + public readonly byte FileID = 0x01; + public readonly byte FileSize = 0xF0; + #endregion + + [Test, Order(1)] + public void SelectApplication() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + + [Test, Order(2)] + public void Authenticate_DES() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + CipherKey key = new CipherKey(CipherType.TDES); + desfire.AuthenticateISO_DES(0x00, key._Key); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + + [Test, Order(3)] + public void Format() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + CipherKey key = new CipherKey(CipherType.TDES); + desfire.AuthenticateISO_DES(0x00, key._Key); + + desfire.Format(); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + + [Test, Order(4)] + public void CreateApplication() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + CipherKey key = new CipherKey(CipherType.TDES); + desfire.AuthenticateISO_DES(0x00, key._Key); + + desfire.Format(); + + desfire.AuthenticateISO_DES(0x00, key._Key); + + byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE); + byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2); + + desfire.CreateApplication(ApplicationID, keysetting1, keysetting2); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + + [Test, Order(5)] + public void Authenticate_AES() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + CipherKey key = new CipherKey(CipherType.TDES); + desfire.AuthenticateISO_DES(0x00, key._Key); + + desfire.Format(); + + desfire.AuthenticateISO_DES(0x00, key._Key); + + byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE); + byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2); + + desfire.CreateApplication(ApplicationID, keysetting1, keysetting2); + + desfire.SelectApplication(ApplicationID); + + CipherKey key_aes = new CipherKey(CipherType.AES); + desfire.AuthenticateISO_AES(0x00, key_aes._Key); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + + [Test, Order(6)] + public void ChangeApplicationMasterKey() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + CipherKey key = new CipherKey(CipherType.TDES); + desfire.AuthenticateISO_DES(0x00, key._Key); + + desfire.Format(); + + desfire.AuthenticateISO_DES(0x00, key._Key); + + byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE); + byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2); + + desfire.CreateApplication(ApplicationID, keysetting1, keysetting2); + + desfire.SelectApplication(ApplicationID); + + CipherKey key_aes = new CipherKey(CipherType.AES); + desfire.AuthenticateISO_AES(0x00, key_aes._Key); + + CipherKey key_aes_new = new CipherKey(ApplicationMasterKey, CipherType.AES, 0x10); + desfire.ChangeKey_AES(0x00, key._Key, key._KeyVersion); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + + [Test, Order(7)] + public void ChangeApplicationKey_1() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + CipherKey key = new CipherKey(CipherType.TDES); + desfire.AuthenticateISO_DES(0x00, key._Key); + + desfire.Format(); + + desfire.AuthenticateISO_DES(0x00, key._Key); + + byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE); + byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2); + + desfire.CreateApplication(ApplicationID, keysetting1, keysetting2); + + desfire.SelectApplication(ApplicationID); + + CipherKey key_aes = new CipherKey(CipherType.AES); + desfire.AuthenticateISO_AES(0x00, key_aes._Key); + + CipherKey key_new = new CipherKey(ApplicationKey_1, CipherType.AES, 0x10); + desfire.ChangeOtherKey_AES(0x01, key_new._Key, key_aes._Key, key_new._KeyVersion); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + + [Test, Order(8)] + public void CreateFile() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + CipherKey key = new CipherKey(CipherType.TDES); + desfire.AuthenticateISO_DES(0x00, key._Key); + + desfire.Format(); + + desfire.AuthenticateISO_DES(0x00, key._Key); + + byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE); + byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2); + + desfire.CreateApplication(ApplicationID, keysetting1, keysetting2); + + desfire.SelectApplication(ApplicationID); + + CipherKey key_aes = new CipherKey(CipherType.AES); + desfire.AuthenticateISO_AES(0x00, key_aes._Key); + + UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00); + desfire.CreateFile_Standard(FileID, FileCommunication.PLAIN, accesRights, FileSize); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + + [Test, Order(9)] + public void WriteFile() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + CipherKey key = new CipherKey(CipherType.TDES); + desfire.AuthenticateISO_DES(0x00, key._Key); + + desfire.Format(); + + desfire.AuthenticateISO_DES(0x00, key._Key); + + byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE); + byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2); + + desfire.CreateApplication(ApplicationID, keysetting1, keysetting2); + + desfire.SelectApplication(ApplicationID); + + CipherKey key_aes = new CipherKey(CipherType.AES); + desfire.AuthenticateISO_AES(0x00, key_aes._Key); + + UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00); + desfire.CreateFile_Standard(FileID, FileCommunication.PLAIN, accesRights, FileSize); + + desfire.WriteData(FileID, 0, Encoding.ASCII.GetBytes("Test1234")); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + + [Test, Order(10)] + public void ReadFile() + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(ReaderID); + + bool test_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + MIFARE_DESFire desfire = new MIFARE_DESFire(card); + + desfire.SelectApplication(0x000000); + + CipherKey key = new CipherKey(CipherType.TDES); + desfire.AuthenticateISO_DES(0x00, key._Key); + + desfire.Format(); + + desfire.AuthenticateISO_DES(0x00, key._Key); + + byte keysetting1 = desfire.GenerateKeySetting1(ChangeApplicationKey.MASTERKEY, ChangeMasterKeySettings.WITHMASTERKEY, CreateDeleteFile.ONLYMASTERKEY, FileDirectoryAccess.NOKEY, ChangeMasterKey.CHANGEABLE); + byte keysetting2 = desfire.GenerateKeySetting2(CryptoOperationsType.AES, FileIdentifies.NOTUSED, 2); + + desfire.CreateApplication(ApplicationID, keysetting1, keysetting2); + + desfire.SelectApplication(ApplicationID); + + CipherKey key_aes = new CipherKey(CipherType.AES); + desfire.AuthenticateISO_AES(0x00, key_aes._Key); + + UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00); + desfire.CreateFile_Standard(FileID, FileCommunication.PLAIN, accesRights, FileSize); + + desfire.WriteData(FileID, 0, Encoding.ASCII.GetBytes("Test1234")); + + byte[] data = desfire.ReadData(FileID, 0, FileSize); + Console.WriteLine(Encoding.ASCII.GetString(data).Replace("\u0000", "")); + + test_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, test_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + } +} diff --git a/NFC_Test/FabAccess_OTA.cs b/NFC_Test/REAL_FabAccess_OTA.cs similarity index 82% rename from NFC_Test/FabAccess_OTA.cs rename to NFC_Test/REAL_FabAccess_OTA.cs index 353a6bd..7edc1ab 100644 --- a/NFC_Test/FabAccess_OTA.cs +++ b/NFC_Test/REAL_FabAccess_OTA.cs @@ -6,13 +6,11 @@ using NFC.Mifare_DESFire.Enums; using System; using System.Text; using NFC.Crypto; -using System.Runtime.CompilerServices; -using System.Drawing.Printing; -namespace NFC_Test +namespace NFC_Real_Test { [TestFixture, Explicit] - public class FabAccess_OTA + public class REAL_FabAccess_OTA { private string _ReaderID = "ACS ACR122U PICC Interface 0"; private UInt32 _FabAccess_AID = 0x2A472D; @@ -23,16 +21,19 @@ namespace NFC_Test private CipherKey _FabAccess_Application_MasterKey = new CipherKey("50645367566B59703273357638792F42", CipherType.AES, 0x10); private CipherKey _FabAccess_Application_AuthKey = new CipherKey("6D5A7134743677397A24432646294A40", CipherType.AES, 0x10); - private string _FabAccess_UserDomain = "thejoklla@fvm.fab-access.org"; + private string _FabAccess_UserDomain = "verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrylooooooooooooooooooongusssssssssssssssssssssssernaaaaaaaaaaaaaaaaaaaaaaaame@fvm.fab-access.org"; private string _FabAccess_Domain = "fvm.fab-access.org"; private CipherKey _Default_DESKey = new CipherKey(CipherType.TDES); private CipherKey _Default_AESKey = new CipherKey(CipherType.AES); - [Test] + /// + /// Create FabAccess Application and UserData File + /// + [Test, Order(1)] public void Init_EmptyCard() { - IHardware hardware = new Hardware(); + IHardware hardware = new PCSC_Hardware(); IReader reader = hardware.OpenReader(_ReaderID); bool transmit_successfully = false; @@ -54,7 +55,7 @@ namespace NFC_Test desfire.CreateApplication(_FabAccess_AID, keySetting1, keySetting2); desfire.SelectApplication(_FabAccess_AID); - desfire.AuthenticateISO_AES(0x00, _Default_DESKey._Key); + desfire.AuthenticateISO_AES(0x00, _Default_AESKey._Key); desfire.ChangeKey_AES(0x00, _FabAccess_Application_MasterKey._Key, _FabAccess_Application_MasterKey._KeyVersion); @@ -62,9 +63,9 @@ namespace NFC_Test desfire.ChangeOtherKey_AES(0x01, _FabAccess_Application_AuthKey._Key, _Default_AESKey._Key, _FabAccess_Application_AuthKey._KeyVersion); UInt16 accesRights = desfire.GenerateFileAccessRights((byte)FileAccessRights.FREE, 0x00, 0x00, 0x00); - desfire.CreateFile_Standard(_FabAccess_FID, FileCommunication.MAC, accesRights, _FabAccess_FSize); + desfire.CreateFile_Standard(_FabAccess_FID, FileCommunication.PLAIN, accesRights, _FabAccess_FSize); - desfire.WriteData(0x01, 0, Encoding.ASCII.GetBytes(_FabAccess_UserDomain)); + desfire.WriteData(_FabAccess_FID, 0, Encoding.ASCII.GetBytes(_FabAccess_UserDomain)); transmit_successfully = true; @@ -80,10 +81,13 @@ namespace NFC_Test reader.CardDiscovered -= handler; } - [Test] + /// + /// Authenticate with UserData File and AuthKey + /// + [Test, Order(2)] public void Authenticate() { - IHardware hardware = new Hardware(); + IHardware hardware = new PCSC_Hardware(); IReader reader = hardware.OpenReader(_ReaderID); bool transmit_successfully = false; @@ -95,7 +99,7 @@ namespace NFC_Test MIFARE_DESFire desfire = new MIFARE_DESFire(card); desfire.SelectApplication(_FabAccess_AID); - byte[] card_data = desfire.ReadData(_FabAccess_FID, 0x00, 0x0F); + byte[] card_data = desfire.ReadData(_FabAccess_FID, 0x00, _FabAccess_FSize); string userdomain = Encoding.ASCII.GetString(card_data).Replace("\u0000", ""); string domain = userdomain.Split('@')[1]; @@ -107,13 +111,6 @@ namespace NFC_Test desfire.SelectApplication(_FabAccess_AID); desfire.AuthenticateISO_AES(0x01, _FabAccess_Application_AuthKey._Key); - byte[] card_data_auth = desfire.ReadData(_FabAccess_FID, 0x00, _FabAccess_FSize); - string userdomain_auth = Encoding.ASCII.GetString(card_data).Replace("\u0000", ""); - if(card_data_auth != card_data) - { - throw new Exception("Authentication failed"); - } - transmit_successfully = true; card.Disconnect(); diff --git a/NFC_Test/REAL_Reader_PCSC.cs b/NFC_Test/REAL_Reader_PCSC.cs new file mode 100644 index 0000000..9510556 --- /dev/null +++ b/NFC_Test/REAL_Reader_PCSC.cs @@ -0,0 +1,62 @@ +using NFC; +using NFC.Readers.PCSC; +using NUnit.Framework; +using System; + +namespace NFC_Real_Test +{ + [TestFixture, Explicit] + public class REAL_Reader_PCSC + { + /// + /// Print PCSC ReaderIDs to Console Out + /// + [Test] + public void GetReaders() + { + IHardware hardware = new PCSC_Hardware(); + string[] readers = hardware.GetReaders(); + + Console.WriteLine("PCSC Readers detected: {0}", readers.Length); + + if (readers.Length > 0) + { + Console.WriteLine("List of ReaderIDs:"); + foreach (string readerID in readers) + { + Console.WriteLine("{0}", readerID); + } + } + } + + /// + /// Connect to specific PCSC Reader by ReaderID + /// + /// ReaderID from GetReaders + [TestCase("ACS ACR122U PICC Interface 0")] + public void Connect(string readerID) + { + IHardware hardware = new PCSC_Hardware(); + IReader reader = hardware.OpenReader(readerID); + + bool connected_successfully = false; + + ReaderEventHandler handler = (sender, card) => + { + card.Connect(); + + connected_successfully = true; + + card.Disconnect(); + }; + + reader.CardDiscovered += handler; + reader.Start(); + + Assert.AreEqual(true, connected_successfully); + + reader.Stop(); + reader.CardDiscovered -= handler; + } + } +} diff --git a/NFC_Test/REAL_Windows.cs b/NFC_Test/REAL_Windows.cs deleted file mode 100644 index a754039..0000000 --- a/NFC_Test/REAL_Windows.cs +++ /dev/null @@ -1,129 +0,0 @@ -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using NFC; -using NFC.Readers.PCSC; -using System.Threading; -using NFC.Mifare_DESFire; -using NFC.Mifare_DESFire.Enums; -using NFC.ISO7816_4; -using PCSC.Iso7816; -using NFC.Crypto; - -namespace NFC_Test -{ - [TestFixture, Explicit] - public class REAL_Windows - { - [Test] - public void GetReaders() - { - IHardware hardware = new Hardware(); - string[] readers = hardware.GetReaders(); - - Console.WriteLine("Readers detected: {0}", readers.Length); - - if(readers.Length > 0) - { - Console.WriteLine("List of ReaderIDs:"); - foreach (string readerID in readers) - { - Console.WriteLine("{0}", readerID); - } - } - } - - [TestCase("ACS ACR122U PICC Interface 0")] - public void Connect(string readerID) - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(readerID); - - bool connected_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - connected_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, connected_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - - [TestCase("ACS ACR122U PICC Interface 0")] - public void Read(string readerID) - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(readerID); - - bool connected_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - MIFARE_DESFire desfire = new MIFARE_DESFire(card); - - desfire.SelectApplication(0x2A472D); - Console.WriteLine(HexConverter.ConvertToHexString(desfire.ReadData(0x01, 0x00, 0xF0))); - - connected_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, connected_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - - [TestCase("ACS ACR122U PICC Interface 0")] - public void Write(string readerID) - { - IHardware hardware = new Hardware(); - IReader reader = hardware.OpenReader(readerID); - - bool connected_successfully = false; - - ReaderEventHandler handler = (sender, card) => - { - card.Connect(); - - MIFARE_DESFire desfire = new MIFARE_DESFire(card); - - desfire.SelectApplication(0x2A472D); - - CipherKey _FabAccess_Application_MasterKey = new CipherKey("50645367566B59703273357638792F42", CipherType.AES, 0x10); - - desfire.AuthenticateISO_AES(0x00, _FabAccess_Application_MasterKey._Key); - desfire.WriteData(0x01, 0x00, HexConverter.ConvertFromHexString("7468656a6f6b6c6c")); - - connected_successfully = true; - - card.Disconnect(); - }; - - reader.CardDiscovered += handler; - reader.Start(); - - Assert.AreEqual(true, connected_successfully); - - reader.Stop(); - reader.CardDiscovered -= handler; - } - } -} diff --git a/NFC_Test/REAL_Windows_CardSetUp.cs b/NFC_Test/REAL_Windows_CardSetUp.cs deleted file mode 100644 index 931a17a..0000000 --- a/NFC_Test/REAL_Windows_CardSetUp.cs +++ /dev/null @@ -1,191 +0,0 @@ -using NFC; -using NFC.Mifare_DESFire; -using NFC.Mifare_DESFire.Enums; -using NFC.Readers.PCSC; -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; - -namespace NFC_Test -{ - //[TestFixture] - //public class REAL_Windows_CardSetUp - //{ - // public static UInt32 FabAccessAID = 0x001100; - // public static string CardReaderID = "ACS ACR122U PICC Interface 0"; - // public static byte[] PICC_MasterKey = new byte[] - // { - // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - // }; - - // public static byte[] APP_MasterKey = new byte[] - // { - // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - // }; - - // public static byte[] APP_Key_1 = new byte[] - // { - // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - // }; - - // public static byte[] APP_Key_2 = new byte[] - // { - // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - // }; - - // public static byte[] Empty_Key = new byte[] - // { - // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - // }; - - // public static byte FabAccessIdentFileID = 0x01; - // public static string UserDomain = "user1@fabaccess.org"; - - // [Test] - // public void ResetCard() - // { - // IHardware hardware = new Hardware(); - // IReader reader = hardware.OpenReader(CardReaderID); - - // bool connected_successfully = false; - - // ReaderEventHandler handler = (sender, card) => - // { - // card.Connect(); - - // MIFARE_DESFire mifareDESFire = new MIFARE_DESFire(card); - - // mifareDESFire.AuthenticateISO_DES(0x01, PICC_MasterKey); - - // mifareDESFire.Format(); - - // connected_successfully = true; - - // card.Disconnect(); - // }; - - // reader.CardDiscovered += handler; - // reader.Start(); - - // Assert.AreEqual(true, connected_successfully); - - // reader.Stop(); - // reader.CardDiscovered -= handler; - // } - - // [Test] - // public void ProvisionCard() - // { - // IHardware hardware = new Hardware(); - // IReader reader = hardware.OpenReader(CardReaderID); - - // bool connected_successfully = false; - - // ReaderEventHandler handler = (sender, card) => - // { - // card.Connect(); - - // MIFARE_DESFire mifareDESFire = new MIFARE_DESFire(card); - - // mifareDESFire.AuthenticateISO_DES(0x01, APP_MasterKey); - // mifareDESFire.CreateApplication(FabAccessAID); - // mifareDESFire.SelectApplication(FabAccessAID); - - // mifareDESFire.AuthenticateDES(0x00, Empty_Key); - // mifareDESFire.ChangeApplicationMasterKey(APP_MasterKey); - - // mifareDESFire.AuthenticateDES(0x00, APP_MasterKey); - // mifareDESFire.ChangeApplicationKey(0x01, APP_Key_1); - - // connected_successfully = true; - - // card.Disconnect(); - // }; - - // reader.CardDiscovered += handler; - // reader.Start(); - - // Assert.AreEqual(true, connected_successfully); - - // reader.Stop(); - // reader.CardDiscovered -= handler; - // } - - - // [Test] - // public void SetUpUserCard() - // { - // IHardware hardware = new Hardware(); - // IReader reader = hardware.OpenReader(CardReaderID); - - // bool connected_successfully = false; - - // ReaderEventHandler handler = (sender, card) => - // { - // card.Connect(); - - // MIFARE_DESFire mifareDESFire = new MIFARE_DESFire(card); - - // mifareDESFire.SelectApplication(FabAccessAID); - // mifareDESFire.AuthenticateDES(0x00, Empty_Key); - // UInt16 fileAccessRight = mifareDESFire.GenerateFileAccessRight(AccessRights.FREE, 0x00, 0x00, 0x00); - // mifareDESFire.CreateFile(FabAccessIdentFileID, FileCommunication.PLAIN, fileAccessRight, (UInt32)0x90); - - // System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); - - // mifareDESFire.WirteData(FabAccessIdentFileID, 0x00000000, 0x00000000, enc.GetBytes(UserDomain)); - - // connected_successfully = true; - - // card.Disconnect(); - // }; - - // reader.CardDiscovered += handler; - // reader.Start(); - - // Assert.AreEqual(true, connected_successfully); - - // reader.Stop(); - // reader.CardDiscovered -= handler; - // } - - // [Test] - // public void AuthenticateCard() - // { - // IHardware hardware = new Hardware(); - // IReader reader = hardware.OpenReader(CardReaderID); - - // bool connected_successfully = false; - - // ReaderEventHandler handler = (sender, card) => - // { - // card.Connect(); - - // MIFARE_DESFire mifareDESFire = new MIFARE_DESFire(card); - - // mifareDESFire.SelectApplication(FabAccessAID); - // byte[] filedata = mifareDESFire.ReadData(FabAccessIdentFileID, 0x00000000, 0x00000000); - - // System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); - // string userdomain = enc.GetString(filedata); - - // Console.WriteLine(userdomain); - - // mifareDESFire.AuthenticateDES(0x01, APP_Key_1); - - // connected_successfully = true; - - // card.Disconnect(); - // }; - - // reader.CardDiscovered += handler; - // reader.Start(); - - // Assert.AreEqual(true, connected_successfully); - - // reader.Stop(); - // reader.CardDiscovered -= handler; - // } - //} -}