citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #2862 from j-selby/update-cryptopp 

Update CryptoPP (byte ambiguity)
This commit is contained in:
bunnei 2017-08-09 16:18:43 -04:00 committed by GitHub
parent 792dee47a7 1a44949ef7
commit c2466a2f19
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/cryptopp/cryptopp vendored

@ -1 +1 @@
Subproject commit 841c37e34765487a2968357369ab74db8b10a62d
Subproject commit 24bc2b85674254fb294e717eb5b47d9f53e786b8

2
src/core/hle/service/cfg/cfg.cpp
View File

@ -681,7 +681,7 @@ void GenerateConsoleUniqueId(u32& random_number, u64& console_id) {
CryptoPP::AutoSeededRandomPool rng;
random_number = rng.GenerateWord32(0, 0xFFFF);
u64_le local_friend_code_seed;
rng.GenerateBlock(reinterpret_cast<byte*>(&local_friend_code_seed),
rng.GenerateBlock(reinterpret_cast<CryptoPP::byte*>(&local_friend_code_seed),
sizeof(local_friend_code_seed));
console_id = (local_friend_code_seed & 0x3FFFFFFFF) | (static_cast<u64>(random_number) << 48);
}