mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-21 19:12:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

exo2: fix bugs in device unique data decrypytion

Browse Source
This commit is contained in:
Michael Scire 2020-05-18 00:37:39 -07:00
parent 7561db5ed2
commit eef3dda23b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libvapours/source/crypto/impl/crypto_gcm_mode_impl.arch.arm64.cpp
View File

@ -188,7 +188,7 @@ namespace ams::crypto::impl {
if (this->aad_remaining > 0) { if (this->aad_remaining > 0) {
while (aad_size > 0) { while (aad_size > 0) {
/* Copy in a byte of the aad to our partial block. */ /* Copy in a byte of the aad to our partial block. */
this->block_x.block_8[BlockSize - 1 - this->aad_remaining] ^= *(cur_aad++); this->block_x.block_8[this->aad_remaining] ^= *(cur_aad++);
/* Note that we consumed a byte. */ /* Note that we consumed a byte. */
--aad_size; --aad_size;
@ -205,7 +205,7 @@ namespace ams::crypto::impl {
while (aad_size >= BlockSize) { while (aad_size >= BlockSize) {
/* Xor the current aad into our work block. */ /* Xor the current aad into our work block. */
for (size_t i = 0; i < BlockSize; ++i) { for (size_t i = 0; i < BlockSize; ++i) {
this->block_x.block_8[BlockSize - 1 - i] ^= *(cur_aad++); this->block_x.block_8[i] ^= *(cur_aad++);
} }
/* Multiply the blocks in our galois field. */ /* Multiply the blocks in our galois field. */
@ -222,7 +222,7 @@ namespace ams::crypto::impl {
/* Xor the data in. */ /* Xor the data in. */
for (size_t i = 0; i < aad_size; ++i) { for (size_t i = 0; i < aad_size; ++i) {
this->block_x.block_8[BlockSize - 1 - i] ^= *(cur_aad++); this->block_x.block_8[i] ^= *(cur_aad++);
} }
} }
} }
@ -285,7 +285,7 @@ namespace ams::crypto::impl {
GaloisFieldMult(std::addressof(this->block_x), std::addressof(this->block_x), std::addressof(this->h_mult_blocks[0])); GaloisFieldMult(std::addressof(this->block_x), std::addressof(this->block_x), std::addressof(this->h_mult_blocks[0]));
/* If we need to do an encryption, do so. */ /* If we need to do an encryption, do so. */
{ if (encrypt) {
/* Encrypt the iv. */ /* Encrypt the iv. */
u8 enc_result[BlockSize]; u8 enc_result[BlockSize];
this->ProcessBlock(enc_result, std::addressof(this->block_ek0), this->block_cipher); this->ProcessBlock(enc_result, std::addressof(this->block_ek0), this->block_cipher);