Cleanup rebase results

Nitrokey · Jun 19, 2021 · 290aadb · 290aadb
1 parent c6d4139
commit 290aadb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/src/ccid/CcidLocalAccess.c b/src/ccid/CcidLocalAccess.c
@@ -66,16 +66,9 @@
 *******************************************************************************/
 
 
-typedef struct
-{
-    unsigned char cAPDULength;
-    unsigned short cAPDUAnswerStatus;
-    unsigned short cAPDUAnswerLength;
-    unsigned char cTPDUSequence;
-    unsigned char cTPDULength;
-    unsigned char cAPDU[CCID_TRANSFER_BUFFER_MAX];
-    unsigned char cTPDU[CCID_TRANSFER_BUFFER_MAX + CCID_TPDU_OVERHEAD];
-} typeSmartcardTransfer;
+uint32_t min(const uint32_t a, const uint32_t b);
+uint16_t send_data_no_response(uint8_t *data, uint8_t data_length);
+int tag_callback(TLV *tlv, uint16_t depth);
 
 static typeSmartcardTransfer tSCT;
 
@@ -231,7 +224,7 @@ unsigned short SendAPDU (typeSmartcardTransfer * _tSCT)
     SendTPDU (_tSCT);
 
     if (APDU_ANSWER_RECEIVE_INCORRECT == _tSCT->cAPDUAnswerStatus
-        && APDU_EOF != tSCT->cAPDUAnswerStatus)
+        && APDU_EOF != _tSCT->cAPDUAnswerStatus)
     {
         return (_tSCT->cAPDUAnswerStatus);
     }

diff --git a/src/hw_config.c b/src/hw_config.c
@@ -464,6 +464,7 @@ typedef struct {
   uint8_t right:4;
 } hexbyte;
 
+
 char HexToAscii2 (uint8_t nHex, uint8_t byte_part)
 {
   if (byte_part==1)

diff --git a/src/inc/CcidLocalAccess.h b/src/inc/CcidLocalAccess.h
@@ -97,7 +97,7 @@ uint8_t testSendUserPW2 (unsigned char* pcPW);
 
 unsigned int CcidReset (void);
 
-#define CCID_TRANSFER_BUFFER_MAX    256
+#define CCID_TRANSFER_BUFFER_MAX    512
 
 #define CCID_TPDU_OVERHEAD          4
 #define CCID_TPDU_PROLOG            3
@@ -125,13 +125,13 @@ unsigned int CcidReset (void);
 
 typedef struct
 {
-  unsigned char cAPDULength;
-  unsigned short cAPDUAnswerStatus;
-  unsigned char cAPDUAnswerLength;
-  unsigned char cTPDUSequence;
-  unsigned char cTPDULength;
-  unsigned char cAPDU[CCID_TRANSFER_BUFFER_MAX];
-  unsigned char cTPDU[CCID_TRANSFER_BUFFER_MAX + CCID_TPDU_OVERHEAD];
+    unsigned char cAPDULength;
+    unsigned short cAPDUAnswerStatus;
+    unsigned short cAPDUAnswerLength;
+    unsigned char cTPDUSequence;
+    unsigned char cTPDULength;
+    unsigned char cAPDU[CCID_TRANSFER_BUFFER_MAX];
+    unsigned char cTPDU[CCID_TRANSFER_BUFFER_MAX + CCID_TPDU_OVERHEAD];
 } typeSmartcardTransfer;
 
 void InitSCTStruct (typeSmartcardTransfer * _tSCT);

diff --git a/src/inc/hw_config.h b/src/inc/hw_config.h
@@ -101,6 +101,7 @@ extern Blink blinkVerifyCorrect;
 extern void Blink_init_all(void);
 void EnableTimer2 (void);
 void init_blinking(void);
+char HexToAscii2 (uint8_t nHex, uint8_t byte_part);
 void reset_to_bootloader(void);
 void exec_bootloader_if_wrong_hardware(void);