Multiple code cleanup changes to TransferState -- Enc of transfers is…

… handled by the APDU pre/post process functions -- Restore point for previous functionality
gcammisa · Jul 20, 2022 · a050d04 · a050d04
1 parent 871451a
commit a050d04
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 944 deletions.
diff --git a/Firmware/Chameleon-Mini/Application/CryptoTDEA-HWAccelerated.S b/Firmware/Chameleon-Mini/Application/CryptoTDEA-HWAccelerated.S
@@ -215,8 +215,8 @@ _CommonEpilogue:
 ;
 ; Returns:
 ;     Nothing.
-.global CryptoEncryptDEA
-CryptoEncryptDEA:
+.global CryptoEncryptDES
+CryptoEncryptDES:
     ; Preserve the clobbered regs
     push    r2
     push    r3
@@ -246,10 +246,10 @@ CryptoEncryptDEA:
     ld      r1, Z+
     ld      r0, Z+
     ; Encrypt
-    movw    r16, r20 
+    movw    r16, r20
     rcall   _EncryptDEA
     ; Store the ciphertext
-    movw    r30, r22 
+    movw    r30, r22
     st      Z+, r7
     st      Z+, r6
     st      Z+, r5
@@ -260,20 +260,21 @@ CryptoEncryptDEA:
     st      Z+, r0
 
     ; Restore clobbered regs
-    pop     r17 
-    pop     r16 
+    pop     r17
+    pop     r16
     ; Reuse epilogue code
     rjmp    _CommonEpilogue
 
+
 ; Input:
 ;     R25:R24 - Pointer to plaintext input buffer
 ;     R23:R22 - Pointer to ciphertext output buffer
 ;     R21:R20 - Key block pointer.
 ;
 ; Returns:
 ;     Nothing.
-.global CryptoDecryptDEA
-CryptoDecryptDEA:
+.global CryptoDecryptDES
+CryptoDecryptDES:
     ; Preserve the clobbered regs
     push    r2
     push    r3
@@ -292,8 +293,8 @@ CryptoDecryptDEA:
     push    r16
     push    r17
 
-    ; Load the plaintext pointer to Z and fetch data
-    movw    r30, r24
+    ; Load the ciphertext pointer to Z and fetch data
+    movw    r30, r22
     ld      r7, Z+
     ld      r6, Z+
     ld      r5, Z+
@@ -302,11 +303,11 @@ CryptoDecryptDEA:
     ld      r2, Z+
     ld      r1, Z+
     ld      r0, Z+
-    ; Encrypt
+    ; Decrypt
     movw    r16, r20
     rcall   _DecryptDEA
-    ; Store the ciphertext
-    movw    r30, r22
+    ; Store the plaintext
+    movw    r30, r24
     st      Z+, r7
     st      Z+, r6
     st      Z+, r5
@@ -401,7 +402,7 @@ CryptoDecrypt3KTDEA:
     push    r16
     push    r17
 
-    ; Load the plaintext pointer to Z and fetch data
+    ; Load the ciphertext pointer to Z and fetch data
     movw    r30, r22
     ld      r7, Z+
     ld      r6, Z+
@@ -411,10 +412,10 @@ CryptoDecrypt3KTDEA:
     ld      r2, Z+
     ld      r1, Z+
     ld      r0, Z+
-    ; Encrypt
+    ; Decrypt
     movw    r16, r20
     rcall   _Decrypt3KTDEA
-    ; Store the ciphertext
+    ; Store the plaintext
     movw    r30, r24
     st      Z+, r7
     st      Z+, r6
@@ -460,7 +461,7 @@ CryptoEncrypt2KTDEA:
     push    r16
     push    r17
 
-    ; Load the plaintext pointer to Z and fetch data
+    ; Load the ciphertext pointer to Z and fetch data
     movw    r30, r24
     ld      r7, Z+
     ld      r6, Z+