nold/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool synced 2024-11-15 02:06:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[nstool] Rename variable.

Browse source
This commit is contained in:
jakcron 2018-07-30 04:42:46 +08:00
parent a569ecc29d
commit c4b2d96bf1
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
programs/nstool/source/EsCertProcess.cpp
View file

@ -116,7 +116,7 @@ void EsCertProcess::validateCert(const es::SignedData<es::CertificateBody>& cert
{ {
throw fnd::Exception(kModuleName, "Issued by Root, but does not have a RSA4096 signature"); throw fnd::Exception(kModuleName, "Issued by Root, but does not have a RSA4096 signature");
} }
sig_validate_res = crypto::rsa::pkcs::rsaVerify(mKeyset->pki_root_sign_key, getCryptoHashAlgoFromEsSignHashAlgo(cert_hash_algo), cert_hash, cert.getSignature().getSignature().data()); sig_validate_res = crypto::rsa::pkcs::rsaVerify(mKeyset->pki.root_sign_key, getCryptoHashAlgoFromEsSignHashAlgo(cert_hash_algo), cert_hash, cert.getSignature().getSignature().data());
} }
else else
{ {

4
programs/nstool/source/UserSettings.cpp
View file

@ -505,8 +505,8 @@ void UserSettings::populateKeyset(sCmdArgs& args)
_SAVE_KEYDATA(_CONCAT_2_STRINGS(kPackage2Base, kRsaKeySuffix[0]), mKeyset.package2_sign_key.priv_exponent, crypto::rsa::kRsa2048Size); _SAVE_KEYDATA(_CONCAT_2_STRINGS(kPackage2Base, kRsaKeySuffix[0]), mKeyset.package2_sign_key.priv_exponent, crypto::rsa::kRsa2048Size);
_SAVE_KEYDATA(_CONCAT_2_STRINGS(kPackage2Base, kRsaKeySuffix[1]), mKeyset.package2_sign_key.modulus, crypto::rsa::kRsa2048Size); _SAVE_KEYDATA(_CONCAT_2_STRINGS(kPackage2Base, kRsaKeySuffix[1]), mKeyset.package2_sign_key.modulus, crypto::rsa::kRsa2048Size);
_SAVE_KEYDATA(_CONCAT_2_STRINGS(kPkiRootBase, kRsaKeySuffix[0]), mKeyset.pki_root_sign_key.priv_exponent, crypto::rsa::kRsa4096Size); _SAVE_KEYDATA(_CONCAT_2_STRINGS(kPkiRootBase, kRsaKeySuffix[0]), mKeyset.pki.root_sign_key.priv_exponent, crypto::rsa::kRsa4096Size);
_SAVE_KEYDATA(_CONCAT_2_STRINGS(kPkiRootBase, kRsaKeySuffix[1]), mKeyset.pki_root_sign_key.modulus, crypto::rsa::kRsa4096Size); _SAVE_KEYDATA(_CONCAT_2_STRINGS(kPkiRootBase, kRsaKeySuffix[1]), mKeyset.pki.root_sign_key.modulus, crypto::rsa::kRsa4096Size);
// save keydata from input args // save keydata from input args

7
programs/nstool/source/nstool.h
View file

@ -65,7 +65,7 @@ struct sKeyset
{ {
crypto::rsa::sRsa2048Key acid_sign_key; crypto::rsa::sRsa2048Key acid_sign_key;
crypto::rsa::sRsa4096Key pki_root_sign_key;
crypto::aes::sAes128Key package1_key[kMasterKeyNum]; crypto::aes::sAes128Key package1_key[kMasterKeyNum];
crypto::rsa::sRsa2048Key package2_sign_key; crypto::rsa::sRsa2048Key package2_sign_key;
@ -94,6 +94,11 @@ struct sKeyset
crypto::rsa::sRsa2048Key sign_key; crypto::rsa::sRsa2048Key sign_key;
crypto::aes::sAes128Key titlekey_kek[kMasterKeyNum]; crypto::aes::sAes128Key titlekey_kek[kMasterKeyNum];
} ticket; } ticket;
struct sPkiData
{
crypto::rsa::sRsa4096Key root_sign_key;
} pki;
}; };
inline byte_t charToByte(char chr) inline byte_t charToByte(char chr)