summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2013-01-28 21:59:37 +1300
committerMatthew Parlane <parlane@gmail.com>2013-01-28 21:59:37 +1300
commited9ef874e581aa2ff5c47ec58e7b741e160b026e (patch)
treec70d53b0d8e801ad4d1bc21290fe568a39377d8e /Source
parentca4ea817e094c0725b526184f41f41e506a68637 (diff)
Double hash was not needed.
Use current keys.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp2
-rw-r--r--Source/Core/Core/Src/ec_wii.cpp3
2 files changed, 1 insertions, 4 deletions
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
index fc933a7279..2c844db0c8 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
@@ -888,7 +888,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
u8 *sig_out = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
- get_ap_sig_and_cert(sig_out, ap_cert_out, m_TitleID, data, data_size, NULL, 0);
+ get_ap_sig_and_cert(sig_out, ap_cert_out, m_TitleID, data, data_size, key_ecc, GetHollywoodID());
break;
}
diff --git a/Source/Core/Core/Src/ec_wii.cpp b/Source/Core/Core/Src/ec_wii.cpp
index afbee4d212..de1274a632 100644
--- a/Source/Core/Core/Src/ec_wii.cpp
+++ b/Source/Core/Core/Src/ec_wii.cpp
@@ -93,10 +93,7 @@ void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u
sha1(ap_cert_out + 0x80, 0x100, hash);
generate_ecdsa(ap_cert_out+4, ap_cert_out+34, NG_priv, hash);
-
sha1(data, data_size, hash);
- sha1(hash, 20, hash);
-
generate_ecdsa(sig_out, sig_out + 30, ap_priv, hash);
}