From 1f1739d366baf7d0a0cf0a93c43987e1031387bf Mon Sep 17 00:00:00 2001 From: Subv Date: Wed, 14 Jun 2017 14:21:35 -0500 Subject: [PATCH] UDS: Move the UDS keyslot used to generate the CCMP key to the AES::KeySlotID enum. --- src/core/hle/service/nwm/uds_data.cpp | 5 +---- src/core/hw/aes/key.h | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/nwm/uds_data.cpp b/src/core/hle/service/nwm/uds_data.cpp index fabdf67a8f..280c73e05f 100644 --- a/src/core/hle/service/nwm/uds_data.cpp +++ b/src/core/hle/service/nwm/uds_data.cpp @@ -17,9 +17,6 @@ namespace NWM { using MacAddress = std::array; -// AES Keyslot used to generate the UDS data frame CCMP key. -constexpr size_t UDSDataCryptoAESKeySlot = 0x2D; - /* * Generates a SNAP-enabled 802.2 LLC header for the specified protocol. * @returns a buffer with the bytes of the generated header. @@ -94,7 +91,7 @@ static std::array GenerateDataCCMPKey( // keyslot 0x2D. using CryptoPP::AES; std::array counter = GetDataCryptoCTR(network_info); - std::array key = HW::AES::GetNormalKey(UDSDataCryptoAESKeySlot); + std::array key = HW::AES::GetNormalKey(HW::AES::KeySlotID::UDSDataKey); CryptoPP::CTR_Mode::Encryption aes; aes.SetKeyWithIV(key.data(), AES::BLOCKSIZE, counter.data()); aes.ProcessData(ccmp_key.data(), passphrase_hash.data(), passphrase_hash.size()); diff --git a/src/core/hw/aes/key.h b/src/core/hw/aes/key.h index b01d04f13e..c9f1342f4f 100644 --- a/src/core/hw/aes/key.h +++ b/src/core/hw/aes/key.h @@ -12,6 +12,8 @@ namespace HW { namespace AES { enum KeySlotID : size_t { + // AES Keyslot used to generate the UDS data frame CCMP key. + UDSDataKey = 0x2D, APTWrap = 0x31, MaxKeySlotID = 0x40,