RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 22:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Crypto: modernize key_vault.h

Browse source 
Use constexpr, remove warning guards
This commit is contained in:
Nekotekina 2021-01-14 13:37:20 +03:00
parent 8b01d05146
commit 4bee8dc37f
3 changed files with 856 additions and 863 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Crypto/unedat.cpp
View file

@ -25,7 +25,7 @@ void generate_key(int crypto_mode, int version, unsigned char *key_final, unsign
// Encrypted ERK.
// Decrypt the key with EDAT_KEY + EDAT_IV and copy the original IV.
memcpy(temp_iv, EDAT_IV, 0x10);
aescbc128_decrypt(version ? EDAT_KEY_1 : EDAT_KEY_0, temp_iv, key, key_final, 0x10);
aescbc128_decrypt(const_cast<u8*>(version ? EDAT_KEY_1 : EDAT_KEY_0), temp_iv, key, key_final, 0x10);
memcpy(iv_final, iv, 0x10);
break;
case 0x20000000:
@ -53,7 +53,7 @@ void generate_hash(int hash_mode, int version, unsigned char *hash_final, unsign
// Encrypted HASH.
// Decrypt the hash with EDAT_KEY + EDAT_IV.
memcpy(temp_iv, EDAT_IV, 0x10);
aescbc128_decrypt(version ? EDAT_KEY_1 : EDAT_KEY_0, temp_iv, hash, hash_final, 0x10);
aescbc128_decrypt(const_cast<u8*>(version ? EDAT_KEY_1 : EDAT_KEY_0), temp_iv, hash, hash_final, 0x10);
break;
case 0x20000000:
// Default HASH.