Finding other places to squeeze space for the DESFire config (Log and terminal buffers stored on the stack)

Author: maxieds

Firmware/Chameleon-Mini/Application/CryptoTDEA.h

@@ -66,7 +66,6 @@ void CryptoDecrypt3KTDEA(void *Plaintext, void *Ciphertext, const uint8_t *Keys)
 void Encrypt3DESBuffer(uint16_t Count, const void *Plaintext, void *Ciphertext, const uint8_t *IV, const uint8_t *Keys);
 void Decrypt3DESBuffer(uint16_t Count, void *Plaintext, const void *Ciphertext, const uint8_t *IV, const uint8_t *Keys);
 
-#ifdef ENABLE_CRYPTO_TESTS
 /** Performs the 2-key Triple DES en/deciphering in the CBC "send" mode (xor-then-crypt)
  *
  * \param Count         Block count, expected to be >= 1
@@ -90,6 +89,7 @@ void CryptoEncrypt2KTDEA_CBCReceive(uint16_t Count, const void *Input, void *Out
 void CryptoDecrypt2KTDEA_CBCReceive(uint16_t Count, const void *Input, void *Output, void *IV, const uint8_t *Keys);
 
 
+#ifdef ENABLE_CRYPTO_TESTS
 /** Performs the 3-key Triple DES en/deciphering in the CBC "send" or "receive" mode
  *
  * \param Count         Block count, expected to be >= 1
@@ -108,15 +108,13 @@ typedef struct {
     uint16_t           blockSize;
 } CryptoTDEA_CBCSpec;
 
-#ifdef ENABLE_CRYPTO_TESTS
 void CryptoTDEA_CBCSend(uint16_t Count, void *Plaintext, void *Ciphertext,
                         void *IV, const uint8_t *Keys, CryptoTDEA_CBCSpec CryptoSpec);
 void CryptoTDEA_CBCRecv(uint16_t Count, void *Plaintext, void *Ciphertext,
                         void *IV, const uint8_t *Keys, CryptoTDEA_CBCSpec CryptoSpec);
 
 uint8_t TransferEncryptTDEASend(uint8_t *Buffer, uint8_t Count);
 uint8_t TransferEncryptTDEAReceive(uint8_t *Buffer, uint8_t Count);
-#endif
 
 /** Applies padding to the data within the buffer
  *

Firmware/Chameleon-Mini/Application/DESFire/DESFireCrypto.c

@@ -283,7 +283,6 @@ uint8_t TransferChecksumFinalMACTDEA(uint8_t *Buffer) {
 
 /* Encryption routines */
 
-#ifdef ENABLE_CRYPTO_TESTS
 uint8_t TransferEncryptTDEASend(uint8_t *Buffer, uint8_t Count) {
     uint8_t AvailablePlaintext = TransferState.ReadData.Encryption.AvailablePlaintext;
     uint8_t TempBuffer[(DESFIRE_MAX_PAYLOAD_TDEA_BLOCKS + 1) * CRYPTO_DES_BLOCK_SIZE];
@@ -315,6 +314,5 @@ uint8_t TransferEncryptTDEAReceive(uint8_t *Buffer, uint8_t Count) {
     LogEntry(LOG_INFO_DESFIRE_INCOMING_DATA_ENC, Buffer, Count);
     return 0;
 }
-#endif
 
 #endif /* CONFIG_MF_DESFIRE_SUPPORT */

Firmware/Chameleon-Mini/Application/DESFire/DESFirePICCControl.c

@@ -131,15 +131,15 @@ uint8_t ReadDataFilterSetup(uint8_t CommSettings) {
         case DESFIRE_COMMS_PLAINTEXT_MAC:
             TransferState.Checksums.UpdateFunc = &TransferChecksumUpdateMACTDEA;
             TransferState.Checksums.FinalFunc = &TransferChecksumFinalMACTDEA;
-            //TransferState.Checksums.MACData.CryptoChecksumFunc.TDEAFunc = &CryptoEncrypt2KTDEA_CBCSend;
+            TransferState.Checksums.MACData.CryptoChecksumFunc.TDEAFunc = &CryptoEncrypt2KTDEA_CBCSend;
             memset(SessionIV, PICC_EMPTY_BYTE, sizeof(SessionIV));
             SessionIVByteSize = CRYPTO_2KTDEA_KEY_SIZE;
             break;
         case DESFIRE_COMMS_CIPHERTEXT_DES:
             TransferState.Checksums.UpdateFunc = &TransferChecksumUpdateCRCA;
             TransferState.Checksums.FinalFunc = &TransferChecksumFinalCRCA;
             TransferState.Checksums.MACData.CRCA = ISO14443A_CRCA_INIT;
-            //TransferState.ReadData.Encryption.Func = &TransferEncryptTDEASend;
+            TransferState.ReadData.Encryption.Func = &TransferEncryptTDEASend;
             memset(SessionIV, PICC_EMPTY_BYTE, sizeof(SessionIV));
             SessionIVByteSize = CRYPTO_3KTDEA_KEY_SIZE;
             break;
@@ -157,19 +157,20 @@ uint8_t WriteDataFilterSetup(uint8_t CommSettings) {
         case DESFIRE_COMMS_PLAINTEXT_MAC:
             TransferState.Checksums.UpdateFunc = &TransferChecksumUpdateMACTDEA;
             TransferState.Checksums.FinalFunc = &TransferChecksumFinalMACTDEA;
-            //TransferState.Checksums.MACData.CryptoChecksumFunc.TDEAFunc = &CryptoEncrypt2KTDEA_CBCReceive;
+            TransferState.Checksums.MACData.CryptoChecksumFunc.TDEAFunc = &CryptoEncrypt2KTDEA_CBCReceive;
             memset(SessionIV, 0, sizeof(SessionIVByteSize));
             SessionIVByteSize = CRYPTO_2KTDEA_KEY_SIZE;
             break;
         case DESFIRE_COMMS_CIPHERTEXT_DES:
             TransferState.Checksums.UpdateFunc = &TransferChecksumUpdateCRCA;
             TransferState.Checksums.FinalFunc = &TransferChecksumFinalCRCA;
             TransferState.Checksums.MACData.CRCA = ISO14443A_CRCA_INIT;
-            //TransferState.WriteData.Encryption.Func = &TransferEncryptTDEAReceive;
+            TransferState.WriteData.Encryption.Func = &TransferEncryptTDEAReceive;
             memset(SessionIV, 0, sizeof(SessionIVByteSize));
             SessionIVByteSize = CRYPTO_3KTDEA_KEY_SIZE;
             break;
         case DESFIRE_COMMS_CIPHERTEXT_AES128:
+        // TODO
         default:
             return STATUS_PARAMETER_ERROR;
     }

Firmware/Chameleon-Mini/Application/MifareDESFire.c

@@ -226,13 +226,13 @@ uint16_t MifareDesfireAppProcess(uint8_t *Buffer, uint16_t BitCount) {
     } else if (ByteCount >= 6 && DesfireCLA(Buffer[0]) && Buffer[2] == 0x00 &&
                Buffer[3] == 0x00 && Buffer[4] == ByteCount - 6) {
         return MifareDesfireProcess(Buffer, BitCount);
-    } else if (ByteCount == 4 && Buffer[2] == 0x37 && Buffer[3] == 0xC8) { 
-        // NXP-based PCD sent a "keep alive" response of ACK, 
-	// so we respond with a corresponding NAK (with CRCA bytes appended):
-	Buffer[2] = 0x7E;
-	Buffer[3] = 0x44;
+    } else if (ByteCount == 4 && Buffer[2] == 0x37 && Buffer[3] == 0xC8) {
+        // NXP-based PCD sent a "keep alive" response of ACK,
+        // so we respond with a corresponding NAK (with CRCA bytes appended):
+        Buffer[2] = 0x7E;
+        Buffer[3] = 0x44;
         ISO14443AAppendCRCA(Buffer, 4);
-	return 6 * BITS_PER_BYTE;
+        return 6 * BITS_PER_BYTE;
     } else if (IsWrappedISO7816CommandType(Buffer, ByteCount)) {
         uint8_t ISO7816PrologueBytes[2];
         memcpy(&ISO7816PrologueBytes[0], Buffer, 2);

Firmware/Chameleon-Mini/Log.c

@@ -229,7 +229,7 @@ void LogSRAMToFRAM(void) {
             LogFRAMAddr += FRAM_Free;
             MemoryWriteBlock(&LogFRAMAddr, FRAM_LOG_ADDR_ADDR, 2);
         } else {
-            // TODO handle the case in which the FRAM is full
+            // TODO: handle the case in which the FRAM is full
         }
     }
 }

Firmware/Chameleon-Mini/Log.h

@@ -3,7 +3,11 @@
 /** @file */
 #include "Common.h"
 
+#ifdef MEMORY_LIMITED_TESTING
+#define LOG_SIZE                1536
+#else
 #define LOG_SIZE	        2048
+#endif
 #define FRAM_LOG_ADDR_ADDR	0x4000 // start of the second half of FRAM
 #define FRAM_LOG_START_ADDR	0x4002 // directly after the address
 #define FRAM_LOG_SIZE		0x3FFE // the whole second half (minus the 2 Bytes of Address)

Firmware/Chameleon-Mini/Terminal/Terminal.h

@@ -16,7 +16,11 @@
 #define TERMINAL_VBUS_PORT      PORTD
 #define TERMINAL_VBUS_MASK      PIN5_bm
 
+#ifdef MEMORY_LIMITED_TESTING
+#define TERMINAL_BUFFER_SIZE    384
+#else
 #define TERMINAL_BUFFER_SIZE	512
+#endif
 
 typedef enum {
     TERMINAL_UNINITIALIZED,