ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move ECCSignature to Common::ec and give it a less confusing name

This commit is contained in:
Léo Lam 2018-05-21 15:40:29 +02:00
parent 44827ba369
commit bea1e38c67
6 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/Crypto/ec.cpp
View File

@ -241,7 +241,7 @@ static void silly_random(u8* rndArea, u8 count)
} }
} }
std::array<u8, 60> Sign(const u8* key, const u8* hash) Signature Sign(const u8* key, const u8* hash)
{ {
u8 e[30]{}; u8 e[30]{};
memcpy(e + 10, hash, 20); memcpy(e + 10, hash, 20);
@ -272,7 +272,7 @@ std::array<u8, 60> Sign(const u8* key, const u8* hash)
bn_inv(minv, m, ec_N, sizeof(minv)); bn_inv(minv, m, ec_N, sizeof(minv));
bn_mul(s.data.data(), minv, kk, ec_N, 30); bn_mul(s.data.data(), minv, kk, ec_N, 30);
std::array<u8, 60> signature; Signature signature;
std::copy(r.data.cbegin(), r.data.cend(), signature.begin()); std::copy(r.data.cbegin(), r.data.cend(), signature.begin());
std::copy(s.data.cbegin(), s.data.cend(), signature.begin() + 30); std::copy(s.data.cbegin(), s.data.cend(), signature.begin() + 30);
return signature; return signature;
@ -300,10 +300,10 @@ bool VerifySignature(const u8* public_key, const u8* signature, const u8* hash)
return (bn_compare(rx.data(), R, 30) == 0); return (bn_compare(rx.data(), R, 30) == 0);
} }
std::array<u8, 60> PrivToPub(const u8* key) PublicKey PrivToPub(const u8* key)
{ {
const Point data = key * ec_G; const Point data = key * ec_G;
std::array<u8, 60> result; PublicKey result;
std::copy_n(data.Data(), result.size(), result.begin()); std::copy_n(data.Data(), result.size(), result.begin());
return result; return result;
} }

7
Source/Core/Common/Crypto/ec.h
View File

@ -10,8 +10,11 @@
namespace Common::ec namespace Common::ec
{ {
using Signature = std::array<u8, 60>;
using PublicKey = std::array<u8, 60>;
/// Generate a signature using ECDSA. /// Generate a signature using ECDSA.
std::array<u8, 60> Sign(const u8* key, const u8* hash); Signature Sign(const u8* key, const u8* hash);
/// Check a signature using ECDSA. /// Check a signature using ECDSA.
/// ///
@ -24,5 +27,5 @@ bool VerifySignature(const u8* public_key, const u8* signature, const u8* hash);
std::array<u8, 60> ComputeSharedSecret(const u8* private_key, const u8* public_key); std::array<u8, 60> ComputeSharedSecret(const u8* private_key, const u8* public_key);
/// Convert a ECC private key (30 bytes) to a public key (60 bytes). /// Convert a ECC private key (30 bytes) to a public key (60 bytes).
std::array<u8, 60> PrivToPub(const u8* key); PublicKey PrivToPub(const u8* key);
} // namespace Common::ec } // namespace Common::ec

2
Source/Core/Core/HW/WiiSave.cpp
View File

@ -455,7 +455,7 @@ void WiiSave::do_sig()
// Sign the data. // Sign the data.
IOS::CertECC ap_cert; IOS::CertECC ap_cert;
IOS::ECCSignature ap_sig; Common::ec::Signature ap_sig;
m_ios.GetIOSC().Sign(ap_sig.data(), reinterpret_cast<u8*>(&ap_cert), Titles::SYSTEM_MENU, m_ios.GetIOSC().Sign(ap_sig.data(), reinterpret_cast<u8*>(&ap_cert), Titles::SYSTEM_MENU,
data.get(), data_size); data.get(), data_size);

4
Source/Core/Core/IOS/ES/Identity.cpp
View File

@ -8,12 +8,14 @@
#include <mbedtls/sha1.h> #include <mbedtls/sha1.h>
#include "Common/Crypto/ec.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/ScopeGuard.h" #include "Common/ScopeGuard.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IOS/ES/Formats.h" #include "Core/IOS/ES/Formats.h"
#include "Core/IOS/IOSC.h"
#include "Core/IOS/Uids.h" #include "Core/IOS/Uids.h"
namespace IOS namespace IOS
@ -197,7 +199,7 @@ IPCCommandResult ES::VerifySign(const IOCtlVRequest& request)
{ {
if (!request.HasNumberOfValidVectors(3, 0)) if (!request.HasNumberOfValidVectors(3, 0))
return GetDefaultReply(ES_EINVAL); return GetDefaultReply(ES_EINVAL);
if (request.in_vectors[1].size != sizeof(IOS::ECCSignature)) if (request.in_vectors[1].size != sizeof(Common::ec::Signature))
return GetDefaultReply(ES_EINVAL); return GetDefaultReply(ES_EINVAL);
std::vector<u8> hash(request.in_vectors[0].size); std::vector<u8> hash(request.in_vectors[0].size);

4
Source/Core/Core/IOS/IOSC.cpp
View File

@ -73,7 +73,7 @@ struct BootMiiKeyDump
u32 ms_id; // 0x200 u32 ms_id; // 0x200
u32 ca_id; // 0x204 u32 ca_id; // 0x204
u32 ng_key_id; // 0x208 u32 ng_key_id; // 0x208
IOS::ECCSignature ng_sig; // 0x20c Common::ec::Signature ng_sig; // 0x20c
struct Counter struct Counter
{ {
u8 boot2version; u8 boot2version;
@ -108,7 +108,7 @@ constexpr std::array<u8, 30> DEFAULT_PRIVATE_KEY = {{
}}; }};
// clang-format off // clang-format off
constexpr ECCSignature DEFAULT_SIGNATURE = {{ constexpr Common::ec::Signature DEFAULT_SIGNATURE = {{
// R // R
0x00, 0xD8, 0x81, 0x63, 0xB2, 0x00, 0x6B, 0x0B, 0x54, 0x82, 0x88, 0x63, 0x81, 0x1C, 0x00, 0x71, 0x00, 0xD8, 0x81, 0x63, 0xB2, 0x00, 0x6B, 0x0B, 0x54, 0x82, 0x88, 0x63, 0x81, 0x1C, 0x00, 0x71,
0x12, 0xED, 0xB7, 0xFD, 0x21, 0xAB, 0x0E, 0x50, 0x0E, 0x1F, 0xBF, 0x78, 0xAD, 0x37, 0x12, 0xED, 0xB7, 0xFD, 0x21, 0xAB, 0x0E, 0x50, 0x0E, 0x1F, 0xBF, 0x78, 0xAD, 0x37,

12
Source/Core/Core/IOS/IOSC.h
View File

@ -13,6 +13,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Crypto/AES.h" #include "Common/Crypto/AES.h"
#include "Common/Crypto/ec.h"
class PointerWrap; class PointerWrap;
@ -37,8 +38,6 @@ enum class PublicKeyType : u32
ECC = 2, ECC = 2,
}; };
using ECCSignature = std::array<u8, 60>;
#pragma pack(push, 4) #pragma pack(push, 4)
struct SignatureRSA4096 struct SignatureRSA4096
{ {
@ -61,7 +60,7 @@ static_assert(sizeof(SignatureRSA2048) == 0x180, "Wrong size for SignatureRSA204
struct SignatureECC struct SignatureECC
{ {
SignatureType type; SignatureType type;
ECCSignature sig; Common::ec::Signature sig;
u8 fill[0x40]; u8 fill[0x40];
char issuer[0x40]; char issuer[0x40];
}; };
@ -76,7 +75,6 @@ struct CertHeader
}; };
using RSA2048PublicKey = std::array<u8, 0x100>; using RSA2048PublicKey = std::array<u8, 0x100>;
using ECCPublicKey = std::array<u8, 60>;
struct CertRSA4096RSA2048 struct CertRSA4096RSA2048
{ {
@ -103,7 +101,7 @@ struct CertRSA2048ECC
{ {
SignatureRSA2048 signature; SignatureRSA2048 signature;
CertHeader header; CertHeader header;
ECCPublicKey public_key; Common::ec::PublicKey public_key;
std::array<u8, 60> padding; std::array<u8, 60> padding;
}; };
static_assert(sizeof(CertRSA2048ECC) == 0x240, "Wrong size for CertRSA2048ECC"); static_assert(sizeof(CertRSA2048ECC) == 0x240, "Wrong size for CertRSA2048ECC");
@ -113,7 +111,7 @@ struct CertECC
{ {
SignatureECC signature; SignatureECC signature;
CertHeader header; CertHeader header;
ECCPublicKey public_key; Common::ec::PublicKey public_key;
std::array<u8, 60> padding; std::array<u8, 60> padding;
}; };
static_assert(sizeof(CertECC) == 0x180, "Wrong size for CertECC"); static_assert(sizeof(CertECC) == 0x180, "Wrong size for CertECC");
@ -267,7 +265,7 @@ private:
KeyEntries m_key_entries; KeyEntries m_key_entries;
KeyEntry m_root_key_entry; KeyEntry m_root_key_entry;
ECCSignature m_console_signature{}; Common::ec::Signature m_console_signature{};
// Retail keyblob are issued by CA00000001. Default to 1 even though IOSC actually defaults to 2. // Retail keyblob are issued by CA00000001. Default to 1 even though IOSC actually defaults to 2.
u32 m_ms_id = 2; u32 m_ms_id = 2;
u32 m_ca_id = 1; u32 m_ca_id = 1;