Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 23:25:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Use CHAR_BIT instead of UINT8_WIDTH

Browse source 
Fix building on Windows
This commit is contained in:
Mary 2023-06-19 23:35:08 +02:00
parent 86dd7f54f5
commit 6bdc754e86
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/crypto/aes_engine.hpp
View file

@ -16,17 +16,17 @@ namespace Crypto {
template<std::size_t N> template<std::size_t N>
static std::array<uint8_t, N> rolArray(const std::array<uint8_t, N>& value, std::size_t bits) { static std::array<uint8_t, N> rolArray(const std::array<uint8_t, N>& value, std::size_t bits) {
const auto bitWidth = N * UINT8_WIDTH; const auto bitWidth = N * CHAR_BIT;
bits %= bitWidth; bits %= bitWidth;
const auto byteShift = bits / UINT8_WIDTH; const auto byteShift = bits / CHAR_BIT;
const auto bitShift = bits % UINT8_WIDTH; const auto bitShift = bits % CHAR_BIT;
std::array<uint8_t, N> result; std::array<uint8_t, N> result;
for (std::size_t i = 0; i < N; i++) { for (std::size_t i = 0; i < N; i++) {
result[i] = ((value[(i + byteShift) % N] << bitShift) | (value[(i + byteShift + 1) % N] >> (UINT8_WIDTH - bitShift))) & UINT8_MAX; result[i] = ((value[(i + byteShift) % N] << bitShift) | (value[(i + byteShift + 1) % N] >> (CHAR_BIT - bitShift))) & UINT8_MAX;
} }
return result; return result;
@ -40,7 +40,7 @@ namespace Crypto {
for (std::int64_t i = N - 1; i >= 0; i--) { for (std::int64_t i = N - 1; i >= 0; i--) {
sum = a[i] + b[i] + carry; sum = a[i] + b[i] + carry;
carry = sum >> UINT8_WIDTH; carry = sum >> CHAR_BIT;
result[i] = static_cast<std::uint8_t>(sum & UINT8_MAX); result[i] = static_cast<std::uint8_t>(sum & UINT8_MAX);
} }