mirror of
https://git.h3cjp.net/H3cJP/yuzu.git
synced 2024-11-14 10:52:53 +00:00
Merge pull request #2862 from j-selby/update-cryptopp
Update CryptoPP (byte ambiguity)
This commit is contained in:
commit
c2466a2f19
2
externals/cryptopp/cryptopp
vendored
2
externals/cryptopp/cryptopp
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 841c37e34765487a2968357369ab74db8b10a62d
|
Subproject commit 24bc2b85674254fb294e717eb5b47d9f53e786b8
|
|
@ -681,7 +681,7 @@ void GenerateConsoleUniqueId(u32& random_number, u64& console_id) {
|
||||||
CryptoPP::AutoSeededRandomPool rng;
|
CryptoPP::AutoSeededRandomPool rng;
|
||||||
random_number = rng.GenerateWord32(0, 0xFFFF);
|
random_number = rng.GenerateWord32(0, 0xFFFF);
|
||||||
u64_le local_friend_code_seed;
|
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));
|
sizeof(local_friend_code_seed));
|
||||||
console_id = (local_friend_code_seed & 0x3FFFFFFFF) | (static_cast<u64>(random_number) << 48);
|
console_id = (local_friend_code_seed & 0x3FFFFFFFF) | (static_cast<u64>(random_number) << 48);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue