From ab76b0b684e80362cc75422a5517c8f56aa4054a Mon Sep 17 00:00:00 2001
From: B3n30 <benediktthomas@gmail.com>
Date: Sat, 28 Mar 2020 21:43:13 +0100
Subject: [PATCH] addressed review comments

---
 src/core/hw/aes/key.cpp |  2 +-
 src/core/hw/rsa/rsa.cpp | 38 ++++++++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/core/hw/aes/key.cpp b/src/core/hw/aes/key.cpp
index 21d63f252..2148ab04c 100644
--- a/src/core/hw/aes/key.cpp
+++ b/src/core/hw/aes/key.cpp
@@ -233,7 +233,7 @@ void LoadNativeFirmKeysOld3DS() {
     firm->Read(0, firm_buffer.size(), firm_buffer.data());
     firm->Close();
 
-    constexpr std::size_t SLOT_0x25_KEY_X_SECRET_OFFSET = 934444;
+    constexpr std::size_t SLOT_0x25_KEY_X_SECRET_OFFSET = 933480;
     constexpr std::size_t SLOT_0x25_KEY_X_SECRET_SIZE = 64;
     std::vector<u8> secret_data(SLOT_0x25_KEY_X_SECRET_SIZE);
     std::memcpy(secret_data.data(), firm_buffer.data() + SLOT_0x25_KEY_X_SECRET_OFFSET,
diff --git a/src/core/hw/rsa/rsa.cpp b/src/core/hw/rsa/rsa.cpp
index b08df31a0..8f2c93243 100644
--- a/src/core/hw/rsa/rsa.cpp
+++ b/src/core/hw/rsa/rsa.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <sstream>
+#include <cryptopp/hex.h>
 #include <cryptopp/integer.h>
 #include <cryptopp/nbtheory.h>
 #include <cryptopp/sha.h>
@@ -37,6 +38,11 @@ std::vector<u8> RsaSlot::GetSignature(const std::vector<u8>& message) {
                                         CryptoPP::Integer(modulus.data(), modulus.size()));
     std::stringstream ss;
     ss << std::hex << sig;
+    CryptoPP::HexDecoder decoder;
+    decoder.Put(reinterpret_cast<unsigned char*>(ss.str().data()), ss.str().size());
+    decoder.MessageEnd();
+    std::vector<u8> result(decoder.MaxRetrievable());
+    decoder.Get(result.data(), result.size());
     return HexToBytes(ss.str());
 }
 
@@ -80,19 +86,27 @@ RsaSlot GetSlot(std::size_t slot_id) {
 }
 
 std::vector<u8> CreateASN1Message(const std::vector<u8>& data) {
-    static constexpr auto asn1_header =
-        "0001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFF003031300D060960864801650304020105000420";
-    std::vector<u8> message = HexToBytes(asn1_header);
+    static constexpr std::array<u8, 224> asn1_header = {
+        {0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x30, 0x31, 0x30, 0x0D, 0x06,
+         0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20}};
+
+    std::vector<u8> message(asn1_header.begin(), asn1_header.end());
     CryptoPP::SHA256 sha;
-    std::array<u8, CryptoPP::SHA256::DIGESTSIZE> hash;
-    sha.CalculateDigest(hash.data(), data.data(), data.size());
-    std::copy(hash.begin(), hash.end(), std::back_inserter(message));
+    message.resize(message.size() + CryptoPP::SHA256::DIGESTSIZE);
+    sha.CalculateDigest(message.data() + asn1_header.size(), data.data(), data.size());
     return message;
 }