exo2: fix bugs in Cmac and DeviceId calculation

2020-05-16 11:59:16 -07:00
parent bb3a8a888f
commit a0b08d0540
2 changed files with 4 additions and 4 deletions
--- a/libraries/libexosphere/source/se/se_aes.cpp
+++ b/libraries/libexosphere/source/se/se_aes.cpp
@@ -181,7 +181,7 @@ namespace ams::se {
            u8 prev = 0;
            for (int i = AesBlockSize - 1; i >= 0; --i) {
                const u8 top = (subkey[i] >> 7);
-                subkey[i] = ((subkey[i] << 1) | top);
+                subkey[i] = ((subkey[i] << 1) | prev);
                prev = top;
            }

@@ -220,7 +220,7 @@ namespace ams::se {
                ExpandSubkey(subkey);

                /* Account for last block. */
-                if (last_block_size) {
+                if (last_block_size != AesBlockSize) {
                    ExpandSubkey(subkey);
                }
            }