[hac] Renamed some classes to remove "Binary" suffix.

This commit is contained in:
jakcron 2018-10-18 20:52:43 +08:00
parent 0dd7d174dd
commit 362e558f7c
11 changed files with 169 additions and 167 deletions

View file

@ -11,17 +11,18 @@ namespace nn
{
namespace hac
{
class AccessControlInfoBinary : public fnd::IByteModel
class AccessControlInfo :
public fnd::IByteModel
{
public:
AccessControlInfoBinary();
AccessControlInfoBinary(const AccessControlInfoBinary& other);
AccessControlInfo();
AccessControlInfo(const AccessControlInfo& other);
void operator=(const AccessControlInfoBinary& other);
bool operator==(const AccessControlInfoBinary& other) const;
bool operator!=(const AccessControlInfoBinary& other) const;
void operator=(const AccessControlInfo& other);
bool operator==(const AccessControlInfo& other) const;
bool operator!=(const AccessControlInfo& other) const;
// export/import binary
// IByteModel
void toBytes();
void fromBytes(const byte_t* data, size_t len);
const fnd::Vec<byte_t>& getBytes() const;

View file

@ -12,7 +12,8 @@ namespace nn
{
namespace hac
{
class AccessControlInfoDescBinary : public fnd::IByteModel
class AccessControlInfoDesc :
public fnd::IByteModel
{
public:
struct sProgramIdRestrict
@ -38,14 +39,14 @@ namespace hac
}
};
AccessControlInfoDescBinary();
AccessControlInfoDescBinary(const AccessControlInfoDescBinary& other);
AccessControlInfoDesc();
AccessControlInfoDesc(const AccessControlInfoDesc& other);
void operator=(const AccessControlInfoDescBinary& other);
bool operator==(const AccessControlInfoDescBinary& other) const;
bool operator!=(const AccessControlInfoDescBinary& other) const;
void operator=(const AccessControlInfoDesc& other);
bool operator==(const AccessControlInfoDesc& other) const;
bool operator!=(const AccessControlInfoDesc& other) const;
// export/import binary
// IByteModel
void toBytes();
void fromBytes(const byte_t* data, size_t len);
const fnd::Vec<byte_t>& getBytes() const;

View file

@ -9,7 +9,7 @@ namespace nn
{
namespace hac
{
class ApplicationControlPropertyBinary :
class ApplicationControlProperty :
public fnd::IByteModel
{
public:
@ -85,14 +85,14 @@ namespace hac
}
};
ApplicationControlPropertyBinary();
ApplicationControlPropertyBinary(const ApplicationControlPropertyBinary& other);
ApplicationControlProperty();
ApplicationControlProperty(const ApplicationControlProperty& other);
void operator=(const ApplicationControlPropertyBinary& other);
bool operator==(const ApplicationControlPropertyBinary& other) const;
bool operator!=(const ApplicationControlPropertyBinary& other) const;
void operator=(const ApplicationControlProperty& other);
bool operator==(const ApplicationControlProperty& other) const;
bool operator!=(const ApplicationControlProperty& other) const;
// export/import binary
// IByteModel
void toBytes();
void fromBytes(const byte_t* bytes, size_t len);
const fnd::Vec<byte_t>& getBytes() const;

View file

@ -1,16 +1,16 @@
#include <nn/hac/AccessControlInfoBinary.h>
#include <nn/hac/AccessControlInfo.h>
nn::hac::AccessControlInfoBinary::AccessControlInfoBinary()
nn::hac::AccessControlInfo::AccessControlInfo()
{
clear();
}
nn::hac::AccessControlInfoBinary::AccessControlInfoBinary(const AccessControlInfoBinary & other)
nn::hac::AccessControlInfo::AccessControlInfo(const AccessControlInfo & other)
{
*this = other;
}
void nn::hac::AccessControlInfoBinary::operator=(const AccessControlInfoBinary & other)
void nn::hac::AccessControlInfo::operator=(const AccessControlInfo & other)
{
mRawBinary = other.mRawBinary;
mProgramId = other.mProgramId;
@ -19,7 +19,7 @@ void nn::hac::AccessControlInfoBinary::operator=(const AccessControlInfoBinary &
mKernelCapabilities = other.mKernelCapabilities;
}
bool nn::hac::AccessControlInfoBinary::operator==(const AccessControlInfoBinary & other) const
bool nn::hac::AccessControlInfo::operator==(const AccessControlInfo & other) const
{
return (mProgramId == other.mProgramId) \
&& (mFileSystemAccessControl == other.mFileSystemAccessControl) \
@ -27,12 +27,12 @@ bool nn::hac::AccessControlInfoBinary::operator==(const AccessControlInfoBinary
&& (mKernelCapabilities == other.mKernelCapabilities);
}
bool nn::hac::AccessControlInfoBinary::operator!=(const AccessControlInfoBinary & other) const
bool nn::hac::AccessControlInfo::operator!=(const AccessControlInfo & other) const
{
return !(*this == other);
}
void nn::hac::AccessControlInfoBinary::toBytes()
void nn::hac::AccessControlInfo::toBytes()
{
// serialise the sections
mFileSystemAccessControl.toBytes();
@ -77,7 +77,7 @@ void nn::hac::AccessControlInfoBinary::toBytes()
memcpy(mRawBinary.data() + kc.offset, mKernelCapabilities.getBytes().data(), kc.size);
}
void nn::hac::AccessControlInfoBinary::fromBytes(const byte_t* data, size_t len)
void nn::hac::AccessControlInfo::fromBytes(const byte_t* data, size_t len)
{
// check size
if (len < sizeof(sAciHeader))
@ -118,12 +118,12 @@ void nn::hac::AccessControlInfoBinary::fromBytes(const byte_t* data, size_t len)
mKernelCapabilities.fromBytes(mRawBinary.data() + hdr.kc.offset.get(), hdr.kc.size.get());
}
const fnd::Vec<byte_t>& nn::hac::AccessControlInfoBinary::getBytes() const
const fnd::Vec<byte_t>& nn::hac::AccessControlInfo::getBytes() const
{
return mRawBinary;
}
void nn::hac::AccessControlInfoBinary::clear()
void nn::hac::AccessControlInfo::clear()
{
mRawBinary.clear();
mProgramId = 0;
@ -132,42 +132,42 @@ void nn::hac::AccessControlInfoBinary::clear()
mKernelCapabilities.clear();
}
uint64_t nn::hac::AccessControlInfoBinary::getProgramId() const
uint64_t nn::hac::AccessControlInfo::getProgramId() const
{
return mProgramId;
}
void nn::hac::AccessControlInfoBinary::setProgramId(uint64_t program_id)
void nn::hac::AccessControlInfo::setProgramId(uint64_t program_id)
{
mProgramId = program_id;
}
const nn::hac::FileSystemAccessControlBinary& nn::hac::AccessControlInfoBinary::getFileSystemAccessControl() const
const nn::hac::FileSystemAccessControlBinary& nn::hac::AccessControlInfo::getFileSystemAccessControl() const
{
return mFileSystemAccessControl;
}
void nn::hac::AccessControlInfoBinary::setFileSystemAccessControl(const nn::hac::FileSystemAccessControlBinary& fac)
void nn::hac::AccessControlInfo::setFileSystemAccessControl(const nn::hac::FileSystemAccessControlBinary& fac)
{
mFileSystemAccessControl = fac;
}
const nn::hac::ServiceAccessControlBinary& nn::hac::AccessControlInfoBinary::getServiceAccessControl() const
const nn::hac::ServiceAccessControlBinary& nn::hac::AccessControlInfo::getServiceAccessControl() const
{
return mServiceAccessControl;
}
void nn::hac::AccessControlInfoBinary::setServiceAccessControl(const nn::hac::ServiceAccessControlBinary& sac)
void nn::hac::AccessControlInfo::setServiceAccessControl(const nn::hac::ServiceAccessControlBinary& sac)
{
mServiceAccessControl = sac;
}
const nn::hac::KernelCapabilityBinary& nn::hac::AccessControlInfoBinary::getKernelCapabilities() const
const nn::hac::KernelCapabilityBinary& nn::hac::AccessControlInfo::getKernelCapabilities() const
{
return mKernelCapabilities;
}
void nn::hac::AccessControlInfoBinary::setKernelCapabilities(const nn::hac::KernelCapabilityBinary& kc)
void nn::hac::AccessControlInfo::setKernelCapabilities(const nn::hac::KernelCapabilityBinary& kc)
{
mKernelCapabilities = kc;
}

View file

@ -1,16 +1,16 @@
#include <nn/hac/AccessControlInfoDescBinary.h>
#include <nn/hac/AccessControlInfoDesc.h>
nn::hac::AccessControlInfoDescBinary::AccessControlInfoDescBinary()
nn::hac::AccessControlInfoDesc::AccessControlInfoDesc()
{
clear();
}
nn::hac::AccessControlInfoDescBinary::AccessControlInfoDescBinary(const AccessControlInfoDescBinary & other)
nn::hac::AccessControlInfoDesc::AccessControlInfoDesc(const AccessControlInfoDesc & other)
{
*this = other;
}
void nn::hac::AccessControlInfoDescBinary::operator=(const AccessControlInfoDescBinary & other)
void nn::hac::AccessControlInfoDesc::operator=(const AccessControlInfoDesc & other)
{
mRawBinary = other.mRawBinary;
mNcaHeaderSignature2Key = other.mNcaHeaderSignature2Key;
@ -21,7 +21,7 @@ void nn::hac::AccessControlInfoDescBinary::operator=(const AccessControlInfoDesc
mKernelCapabilities = other.mKernelCapabilities;
}
bool nn::hac::AccessControlInfoDescBinary::operator==(const AccessControlInfoDescBinary & other) const
bool nn::hac::AccessControlInfoDesc::operator==(const AccessControlInfoDesc & other) const
{
return (mNcaHeaderSignature2Key == other.mNcaHeaderSignature2Key) \
&& (mFlags == other.mFlags) \
@ -31,12 +31,12 @@ bool nn::hac::AccessControlInfoDescBinary::operator==(const AccessControlInfoDes
&& (mKernelCapabilities == other.mKernelCapabilities);
}
bool nn::hac::AccessControlInfoDescBinary::operator!=(const AccessControlInfoDescBinary & other) const
bool nn::hac::AccessControlInfoDesc::operator!=(const AccessControlInfoDesc & other) const
{
return !(*this == other);
}
void nn::hac::AccessControlInfoDescBinary::toBytes()
void nn::hac::AccessControlInfoDesc::toBytes()
{
// serialise the sections
mFileSystemAccessControl.toBytes();
@ -94,7 +94,7 @@ void nn::hac::AccessControlInfoDescBinary::toBytes()
memcpy(mRawBinary.data() + kc.offset, mKernelCapabilities.getBytes().data(), kc.size);
}
void nn::hac::AccessControlInfoDescBinary::fromBytes(const byte_t* data, size_t len)
void nn::hac::AccessControlInfoDesc::fromBytes(const byte_t* data, size_t len)
{
// check size
if (len < sizeof(sAciDescHeader))
@ -145,12 +145,12 @@ void nn::hac::AccessControlInfoDescBinary::fromBytes(const byte_t* data, size_t
mKernelCapabilities.fromBytes(mRawBinary.data() + hdr.kc.offset.get(), hdr.kc.size.get());
}
const fnd::Vec<byte_t>& nn::hac::AccessControlInfoDescBinary::getBytes() const
const fnd::Vec<byte_t>& nn::hac::AccessControlInfoDesc::getBytes() const
{
return mRawBinary;
}
void nn::hac::AccessControlInfoDescBinary::generateSignature(const fnd::rsa::sRsa2048Key& key)
void nn::hac::AccessControlInfoDesc::generateSignature(const fnd::rsa::sRsa2048Key& key)
{
if (mRawBinary.size() == 0)
toBytes();
@ -164,7 +164,7 @@ void nn::hac::AccessControlInfoDescBinary::generateSignature(const fnd::rsa::sRs
}
}
void nn::hac::AccessControlInfoDescBinary::validateSignature(const fnd::rsa::sRsa2048Key& key) const
void nn::hac::AccessControlInfoDesc::validateSignature(const fnd::rsa::sRsa2048Key& key) const
{
if (mRawBinary.size() == 0)
throw fnd::Exception(kModuleName, "No Access Control Info Desc binary exists to verify");
@ -178,7 +178,7 @@ void nn::hac::AccessControlInfoDescBinary::validateSignature(const fnd::rsa::sRs
}
}
void nn::hac::AccessControlInfoDescBinary::clear()
void nn::hac::AccessControlInfoDesc::clear()
{
mRawBinary.clear();
memset((void*)&mNcaHeaderSignature2Key, 0, sizeof(mNcaHeaderSignature2Key));
@ -190,62 +190,62 @@ void nn::hac::AccessControlInfoDescBinary::clear()
mKernelCapabilities.clear();
}
const fnd::rsa::sRsa2048Key& nn::hac::AccessControlInfoDescBinary::getNcaHeaderSignature2Key() const
const fnd::rsa::sRsa2048Key& nn::hac::AccessControlInfoDesc::getNcaHeaderSignature2Key() const
{
return mNcaHeaderSignature2Key;
}
void nn::hac::AccessControlInfoDescBinary::setNcaHeaderSignature2Key(const fnd::rsa::sRsa2048Key& key)
void nn::hac::AccessControlInfoDesc::setNcaHeaderSignature2Key(const fnd::rsa::sRsa2048Key& key)
{
mNcaHeaderSignature2Key = key;
}
const fnd::List<nn::hac::aci::Flag>& nn::hac::AccessControlInfoDescBinary::getFlagList() const
const fnd::List<nn::hac::aci::Flag>& nn::hac::AccessControlInfoDesc::getFlagList() const
{
return mFlags;
}
void nn::hac::AccessControlInfoDescBinary::setFlagList(const fnd::List<nn::hac::aci::Flag>& flags)
void nn::hac::AccessControlInfoDesc::setFlagList(const fnd::List<nn::hac::aci::Flag>& flags)
{
mFlags = flags;
}
const nn::hac::AccessControlInfoDescBinary::sProgramIdRestrict& nn::hac::AccessControlInfoDescBinary::getProgramIdRestrict() const
const nn::hac::AccessControlInfoDesc::sProgramIdRestrict& nn::hac::AccessControlInfoDesc::getProgramIdRestrict() const
{
return mProgramIdRestrict;
}
void nn::hac::AccessControlInfoDescBinary::setProgramIdRestrict(const sProgramIdRestrict& pid_restrict)
void nn::hac::AccessControlInfoDesc::setProgramIdRestrict(const sProgramIdRestrict& pid_restrict)
{
mProgramIdRestrict = pid_restrict;
}
const nn::hac::FileSystemAccessControlBinary& nn::hac::AccessControlInfoDescBinary::getFileSystemAccessControl() const
const nn::hac::FileSystemAccessControlBinary& nn::hac::AccessControlInfoDesc::getFileSystemAccessControl() const
{
return mFileSystemAccessControl;
}
void nn::hac::AccessControlInfoDescBinary::setFileSystemAccessControl(const nn::hac::FileSystemAccessControlBinary& fac)
void nn::hac::AccessControlInfoDesc::setFileSystemAccessControl(const nn::hac::FileSystemAccessControlBinary& fac)
{
mFileSystemAccessControl = fac;
}
const nn::hac::ServiceAccessControlBinary& nn::hac::AccessControlInfoDescBinary::getServiceAccessControl() const
const nn::hac::ServiceAccessControlBinary& nn::hac::AccessControlInfoDesc::getServiceAccessControl() const
{
return mServiceAccessControl;
}
void nn::hac::AccessControlInfoDescBinary::setServiceAccessControl(const nn::hac::ServiceAccessControlBinary& sac)
void nn::hac::AccessControlInfoDesc::setServiceAccessControl(const nn::hac::ServiceAccessControlBinary& sac)
{
mServiceAccessControl = sac;
}
const nn::hac::KernelCapabilityBinary& nn::hac::AccessControlInfoDescBinary::getKernelCapabilities() const
const nn::hac::KernelCapabilityBinary& nn::hac::AccessControlInfoDesc::getKernelCapabilities() const
{
return mKernelCapabilities;
}
void nn::hac::AccessControlInfoDescBinary::setKernelCapabilities(const nn::hac::KernelCapabilityBinary& kc)
void nn::hac::AccessControlInfoDesc::setKernelCapabilities(const nn::hac::KernelCapabilityBinary& kc)
{
mKernelCapabilities = kc;
}

View file

@ -1,17 +1,17 @@
#include <cstring>
#include <nn/hac/ApplicationControlPropertyBinary.h>
#include <nn/hac/ApplicationControlProperty.h>
nn::hac::ApplicationControlPropertyBinary::ApplicationControlPropertyBinary()
nn::hac::ApplicationControlProperty::ApplicationControlProperty()
{
clear();
}
nn::hac::ApplicationControlPropertyBinary::ApplicationControlPropertyBinary(const ApplicationControlPropertyBinary& other)
nn::hac::ApplicationControlProperty::ApplicationControlProperty(const ApplicationControlProperty& other)
{
*this = other;
}
void nn::hac::ApplicationControlPropertyBinary::operator=(const ApplicationControlPropertyBinary& other)
void nn::hac::ApplicationControlProperty::operator=(const ApplicationControlProperty& other)
{
clear();
mTitle = other.mTitle;
@ -55,7 +55,7 @@ void nn::hac::ApplicationControlPropertyBinary::operator=(const ApplicationContr
mProgramIndex = other.mProgramIndex;
}
bool nn::hac::ApplicationControlPropertyBinary::operator==(const ApplicationControlPropertyBinary& other) const
bool nn::hac::ApplicationControlProperty::operator==(const ApplicationControlProperty& other) const
{
return (mTitle == other.mTitle) \
&& (mIsbn == other.mIsbn) \
@ -98,12 +98,12 @@ bool nn::hac::ApplicationControlPropertyBinary::operator==(const ApplicationCont
&& (mProgramIndex == other.mProgramIndex);
}
bool nn::hac::ApplicationControlPropertyBinary::operator!=(const ApplicationControlPropertyBinary& other) const
bool nn::hac::ApplicationControlProperty::operator!=(const ApplicationControlProperty& other) const
{
return !(*this == other);
}
void nn::hac::ApplicationControlPropertyBinary::toBytes()
void nn::hac::ApplicationControlProperty::toBytes()
{
mRawBinary.alloc(sizeof(nn::hac::sApplicationControlProperty));
@ -183,7 +183,7 @@ void nn::hac::ApplicationControlPropertyBinary::toBytes()
data->cache_storage_data_and_journal_size_max = mCacheStorageDataAndJournalSizeMax;
}
void nn::hac::ApplicationControlPropertyBinary::fromBytes(const byte_t* bytes, size_t len)
void nn::hac::ApplicationControlProperty::fromBytes(const byte_t* bytes, size_t len)
{
if (len < sizeof(nn::hac::sApplicationControlProperty))
{
@ -276,12 +276,12 @@ void nn::hac::ApplicationControlPropertyBinary::fromBytes(const byte_t* bytes, s
mCacheStorageDataAndJournalSizeMax = (int64_t)data->cache_storage_data_and_journal_size_max.get();
}
const fnd::Vec<byte_t>& nn::hac::ApplicationControlPropertyBinary::getBytes() const
const fnd::Vec<byte_t>& nn::hac::ApplicationControlProperty::getBytes() const
{
return mRawBinary;
}
void nn::hac::ApplicationControlPropertyBinary::clear()
void nn::hac::ApplicationControlProperty::clear()
{
mRawBinary.clear();
mTitle.clear();
@ -325,392 +325,392 @@ void nn::hac::ApplicationControlPropertyBinary::clear()
mProgramIndex = 0;
}
const fnd::List<nn::hac::ApplicationControlPropertyBinary::sTitle>& nn::hac::ApplicationControlPropertyBinary::getTitle() const
const fnd::List<nn::hac::ApplicationControlProperty::sTitle>& nn::hac::ApplicationControlProperty::getTitle() const
{
return mTitle;
}
void nn::hac::ApplicationControlPropertyBinary::setTitle(const fnd::List<sTitle>& title)
void nn::hac::ApplicationControlProperty::setTitle(const fnd::List<sTitle>& title)
{
mTitle = title;
}
const std::string& nn::hac::ApplicationControlPropertyBinary::getIsbn() const
const std::string& nn::hac::ApplicationControlProperty::getIsbn() const
{
return mIsbn;
}
void nn::hac::ApplicationControlPropertyBinary::setIsbn(const std::string& isbn)
void nn::hac::ApplicationControlProperty::setIsbn(const std::string& isbn)
{
mIsbn = isbn;
}
nn::hac::nacp::StartupUserAccount nn::hac::ApplicationControlPropertyBinary::getStartupUserAccount() const
nn::hac::nacp::StartupUserAccount nn::hac::ApplicationControlProperty::getStartupUserAccount() const
{
return mStartupUserAccount;
}
void nn::hac::ApplicationControlPropertyBinary::setStartupUserAccount(nacp::StartupUserAccount var)
void nn::hac::ApplicationControlProperty::setStartupUserAccount(nacp::StartupUserAccount var)
{
mStartupUserAccount = var;
}
nn::hac::nacp::TouchScreenUsageMode nn::hac::ApplicationControlPropertyBinary::getTouchScreenUsageMode() const
nn::hac::nacp::TouchScreenUsageMode nn::hac::ApplicationControlProperty::getTouchScreenUsageMode() const
{
return mTouchScreenUsageMode;
}
void nn::hac::ApplicationControlPropertyBinary::setTouchScreenUsageMode(nacp::TouchScreenUsageMode var)
void nn::hac::ApplicationControlProperty::setTouchScreenUsageMode(nacp::TouchScreenUsageMode var)
{
mTouchScreenUsageMode = var;
}
nn::hac::nacp::AocRegistrationType nn::hac::ApplicationControlPropertyBinary::getAocRegistrationType() const
nn::hac::nacp::AocRegistrationType nn::hac::ApplicationControlProperty::getAocRegistrationType() const
{
return mAocRegistrationType;
}
void nn::hac::ApplicationControlPropertyBinary::setAocRegistrationType(nacp::AocRegistrationType var)
void nn::hac::ApplicationControlProperty::setAocRegistrationType(nacp::AocRegistrationType var)
{
mAocRegistrationType = var;
}
nn::hac::nacp::AttributeFlag nn::hac::ApplicationControlPropertyBinary::getAttributeFlag() const
nn::hac::nacp::AttributeFlag nn::hac::ApplicationControlProperty::getAttributeFlag() const
{
return mAttributeFlag;
}
void nn::hac::ApplicationControlPropertyBinary::setAttributeFlag(nacp::AttributeFlag var)
void nn::hac::ApplicationControlProperty::setAttributeFlag(nacp::AttributeFlag var)
{
mAttributeFlag = var;
}
const fnd::List<nn::hac::nacp::Language>& nn::hac::ApplicationControlPropertyBinary::getSupportedLanguages() const
const fnd::List<nn::hac::nacp::Language>& nn::hac::ApplicationControlProperty::getSupportedLanguages() const
{
return mSupportedLanguages;
}
void nn::hac::ApplicationControlPropertyBinary::setSupportedLanguages(const fnd::List<nacp::Language>& var)
void nn::hac::ApplicationControlProperty::setSupportedLanguages(const fnd::List<nacp::Language>& var)
{
mSupportedLanguages = var;
}
nn::hac::nacp::ParentalControlFlag nn::hac::ApplicationControlPropertyBinary::getParentalControlFlag() const
nn::hac::nacp::ParentalControlFlag nn::hac::ApplicationControlProperty::getParentalControlFlag() const
{
return mParentalControlFlag;
}
void nn::hac::ApplicationControlPropertyBinary::setParentalControlFlag(nacp::ParentalControlFlag var)
void nn::hac::ApplicationControlProperty::setParentalControlFlag(nacp::ParentalControlFlag var)
{
mParentalControlFlag = var;
}
nn::hac::nacp::ScreenshotMode nn::hac::ApplicationControlPropertyBinary::getScreenshotMode() const
nn::hac::nacp::ScreenshotMode nn::hac::ApplicationControlProperty::getScreenshotMode() const
{
return mScreenshotMode;
}
void nn::hac::ApplicationControlPropertyBinary::setScreenshotMode(nacp::ScreenshotMode var)
void nn::hac::ApplicationControlProperty::setScreenshotMode(nacp::ScreenshotMode var)
{
mScreenshotMode = var;
}
nn::hac::nacp::VideoCaptureMode nn::hac::ApplicationControlPropertyBinary::getVideoCaptureMode() const
nn::hac::nacp::VideoCaptureMode nn::hac::ApplicationControlProperty::getVideoCaptureMode() const
{
return mVideoCaptureMode;
}
void nn::hac::ApplicationControlPropertyBinary::setVideoCaptureMode(nacp::VideoCaptureMode var)
void nn::hac::ApplicationControlProperty::setVideoCaptureMode(nacp::VideoCaptureMode var)
{
mVideoCaptureMode = var;
}
nn::hac::nacp::DataLossConfirmation nn::hac::ApplicationControlPropertyBinary::getDataLossConfirmation() const
nn::hac::nacp::DataLossConfirmation nn::hac::ApplicationControlProperty::getDataLossConfirmation() const
{
return mDataLossConfirmation;
}
void nn::hac::ApplicationControlPropertyBinary::setDataLossConfirmation(nacp::DataLossConfirmation var)
void nn::hac::ApplicationControlProperty::setDataLossConfirmation(nacp::DataLossConfirmation var)
{
mDataLossConfirmation = var;
}
nn::hac::nacp::PlayLogPolicy nn::hac::ApplicationControlPropertyBinary::getPlayLogPolicy() const
nn::hac::nacp::PlayLogPolicy nn::hac::ApplicationControlProperty::getPlayLogPolicy() const
{
return mPlayLogPolicy;
}
void nn::hac::ApplicationControlPropertyBinary::setPlayLogPolicy(nacp::PlayLogPolicy var)
void nn::hac::ApplicationControlProperty::setPlayLogPolicy(nacp::PlayLogPolicy var)
{
mPlayLogPolicy = var;
}
uint64_t nn::hac::ApplicationControlPropertyBinary::getPresenceGroupId() const
uint64_t nn::hac::ApplicationControlProperty::getPresenceGroupId() const
{
return mPresenceGroupId;
}
void nn::hac::ApplicationControlPropertyBinary::setPresenceGroupId(uint64_t var)
void nn::hac::ApplicationControlProperty::setPresenceGroupId(uint64_t var)
{
mPresenceGroupId = var;
}
const fnd::List<nn::hac::ApplicationControlPropertyBinary::sRating>& nn::hac::ApplicationControlPropertyBinary::getRatingAge() const
const fnd::List<nn::hac::ApplicationControlProperty::sRating>& nn::hac::ApplicationControlProperty::getRatingAge() const
{
return mRatingAge;
}
void nn::hac::ApplicationControlPropertyBinary::setRatingAge(const fnd::List<sRating>& var)
void nn::hac::ApplicationControlProperty::setRatingAge(const fnd::List<sRating>& var)
{
mRatingAge = var;
}
const std::string& nn::hac::ApplicationControlPropertyBinary::getDisplayVersion() const
const std::string& nn::hac::ApplicationControlProperty::getDisplayVersion() const
{
return mDisplayVersion;
}
void nn::hac::ApplicationControlPropertyBinary::setDisplayVersion(const std::string& var)
void nn::hac::ApplicationControlProperty::setDisplayVersion(const std::string& var)
{
mDisplayVersion = var;
}
uint64_t nn::hac::ApplicationControlPropertyBinary::getAocBaseId() const
uint64_t nn::hac::ApplicationControlProperty::getAocBaseId() const
{
return mAocBaseId;
}
void nn::hac::ApplicationControlPropertyBinary::setAocBaseId(uint64_t var)
void nn::hac::ApplicationControlProperty::setAocBaseId(uint64_t var)
{
mAocBaseId = var;
}
uint64_t nn::hac::ApplicationControlPropertyBinary::getSaveDatawOwnerId() const
uint64_t nn::hac::ApplicationControlProperty::getSaveDatawOwnerId() const
{
return mSaveDatawOwnerId;
}
void nn::hac::ApplicationControlPropertyBinary::setSaveDatawOwnerId(uint64_t var)
void nn::hac::ApplicationControlProperty::setSaveDatawOwnerId(uint64_t var)
{
mSaveDatawOwnerId = var;
}
const nn::hac::ApplicationControlPropertyBinary::sStorageSize& nn::hac::ApplicationControlPropertyBinary::getUserAccountSaveDataSize() const
const nn::hac::ApplicationControlProperty::sStorageSize& nn::hac::ApplicationControlProperty::getUserAccountSaveDataSize() const
{
return mUserAccountSaveDataSize;
}
void nn::hac::ApplicationControlPropertyBinary::setUserAccountSaveDataSize(const sStorageSize& var)
void nn::hac::ApplicationControlProperty::setUserAccountSaveDataSize(const sStorageSize& var)
{
mUserAccountSaveDataSize = var;
}
const nn::hac::ApplicationControlPropertyBinary::sStorageSize& nn::hac::ApplicationControlPropertyBinary::getDeviceSaveDataSize() const
const nn::hac::ApplicationControlProperty::sStorageSize& nn::hac::ApplicationControlProperty::getDeviceSaveDataSize() const
{
return mDeviceSaveDataSize;
}
void nn::hac::ApplicationControlPropertyBinary::setDeviceSaveDataSize(const sStorageSize& var)
void nn::hac::ApplicationControlProperty::setDeviceSaveDataSize(const sStorageSize& var)
{
mDeviceSaveDataSize = var;
}
int64_t nn::hac::ApplicationControlPropertyBinary::getBcatDeliveryCacheStorageSize() const
int64_t nn::hac::ApplicationControlProperty::getBcatDeliveryCacheStorageSize() const
{
return mBcatDeliveryCacheStorageSize;
}
void nn::hac::ApplicationControlPropertyBinary::setBcatDeliveryCacheStorageSize(int64_t var)
void nn::hac::ApplicationControlProperty::setBcatDeliveryCacheStorageSize(int64_t var)
{
mBcatDeliveryCacheStorageSize = var;
}
const std::string& nn::hac::ApplicationControlPropertyBinary::getApplicationErrorCodeCategory() const
const std::string& nn::hac::ApplicationControlProperty::getApplicationErrorCodeCategory() const
{
return mApplicationErrorCodeCategory;
}
void nn::hac::ApplicationControlPropertyBinary::setApplicationErrorCodeCategory(const std::string& var)
void nn::hac::ApplicationControlProperty::setApplicationErrorCodeCategory(const std::string& var)
{
mApplicationErrorCodeCategory = var;
}
const fnd::List<uint64_t>& nn::hac::ApplicationControlPropertyBinary::getLocalCommunicationId() const
const fnd::List<uint64_t>& nn::hac::ApplicationControlProperty::getLocalCommunicationId() const
{
return mLocalCommunicationId;
}
void nn::hac::ApplicationControlPropertyBinary::setLocalCommunicationId(const fnd::List<uint64_t>& var)
void nn::hac::ApplicationControlProperty::setLocalCommunicationId(const fnd::List<uint64_t>& var)
{
mLocalCommunicationId = var;
}
nn::hac::nacp::LogoType nn::hac::ApplicationControlPropertyBinary::getLogoType() const
nn::hac::nacp::LogoType nn::hac::ApplicationControlProperty::getLogoType() const
{
return mLogoType;
}
void nn::hac::ApplicationControlPropertyBinary::setLogoType(nacp::LogoType var)
void nn::hac::ApplicationControlProperty::setLogoType(nacp::LogoType var)
{
mLogoType = var;
}
nn::hac::nacp::LogoHandling nn::hac::ApplicationControlPropertyBinary::getLogoHandling() const
nn::hac::nacp::LogoHandling nn::hac::ApplicationControlProperty::getLogoHandling() const
{
return mLogoHandling;
}
void nn::hac::ApplicationControlPropertyBinary::setLogoHandling(nacp::LogoHandling var)
void nn::hac::ApplicationControlProperty::setLogoHandling(nacp::LogoHandling var)
{
mLogoHandling = var;
}
nn::hac::nacp::RuntimeAocInstallMode nn::hac::ApplicationControlPropertyBinary::getRuntimeAocInstallMode() const
nn::hac::nacp::RuntimeAocInstallMode nn::hac::ApplicationControlProperty::getRuntimeAocInstallMode() const
{
return mRuntimeAocInstallMode;
}
void nn::hac::ApplicationControlPropertyBinary::setRuntimeAocInstallMode(nacp::RuntimeAocInstallMode var)
void nn::hac::ApplicationControlProperty::setRuntimeAocInstallMode(nacp::RuntimeAocInstallMode var)
{
mRuntimeAocInstallMode = var;
}
nn::hac::nacp::CrashReportMode nn::hac::ApplicationControlPropertyBinary::getCrashReportMode() const
nn::hac::nacp::CrashReportMode nn::hac::ApplicationControlProperty::getCrashReportMode() const
{
return mCrashReportMode;
}
void nn::hac::ApplicationControlPropertyBinary::setCrashReportMode(nacp::CrashReportMode var)
void nn::hac::ApplicationControlProperty::setCrashReportMode(nacp::CrashReportMode var)
{
mCrashReportMode = var;
}
nn::hac::nacp::Hdcp nn::hac::ApplicationControlPropertyBinary::getHdcp() const
nn::hac::nacp::Hdcp nn::hac::ApplicationControlProperty::getHdcp() const
{
return mHdcp;
}
void nn::hac::ApplicationControlPropertyBinary::setHdcp(nacp::Hdcp var)
void nn::hac::ApplicationControlProperty::setHdcp(nacp::Hdcp var)
{
mHdcp = var;
}
uint64_t nn::hac::ApplicationControlPropertyBinary::getSeedForPsuedoDeviceId() const
uint64_t nn::hac::ApplicationControlProperty::getSeedForPsuedoDeviceId() const
{
return mSeedForPsuedoDeviceId;
}
void nn::hac::ApplicationControlPropertyBinary::setSeedForPsuedoDeviceId(uint64_t var)
void nn::hac::ApplicationControlProperty::setSeedForPsuedoDeviceId(uint64_t var)
{
mSeedForPsuedoDeviceId = var;
}
const std::string& nn::hac::ApplicationControlPropertyBinary::getBcatPassphase() const
const std::string& nn::hac::ApplicationControlProperty::getBcatPassphase() const
{
return mBcatPassphase;
}
void nn::hac::ApplicationControlPropertyBinary::setBcatPassphase(const std::string& var)
void nn::hac::ApplicationControlProperty::setBcatPassphase(const std::string& var)
{
mBcatPassphase = var;
}
const nn::hac::ApplicationControlPropertyBinary::sStorageSize& nn::hac::ApplicationControlPropertyBinary::getUserAccountSaveDataMax() const
const nn::hac::ApplicationControlProperty::sStorageSize& nn::hac::ApplicationControlProperty::getUserAccountSaveDataMax() const
{
return mUserAccountSaveDataMax;
}
void nn::hac::ApplicationControlPropertyBinary::setUserAccountSaveDataMax(const sStorageSize& var)
void nn::hac::ApplicationControlProperty::setUserAccountSaveDataMax(const sStorageSize& var)
{
mUserAccountSaveDataMax = var;
}
const nn::hac::ApplicationControlPropertyBinary::sStorageSize& nn::hac::ApplicationControlPropertyBinary::getDeviceSaveDataMax() const
const nn::hac::ApplicationControlProperty::sStorageSize& nn::hac::ApplicationControlProperty::getDeviceSaveDataMax() const
{
return mDeviceSaveDataMax;
}
void nn::hac::ApplicationControlPropertyBinary::setDeviceSaveDataMax(const sStorageSize& var)
void nn::hac::ApplicationControlProperty::setDeviceSaveDataMax(const sStorageSize& var)
{
mDeviceSaveDataMax = var;
}
int64_t nn::hac::ApplicationControlPropertyBinary::getTemporaryStorageSize() const
int64_t nn::hac::ApplicationControlProperty::getTemporaryStorageSize() const
{
return mTemporaryStorageSize;
}
void nn::hac::ApplicationControlPropertyBinary::setTemporaryStorageSize(int64_t var)
void nn::hac::ApplicationControlProperty::setTemporaryStorageSize(int64_t var)
{
mTemporaryStorageSize = var;
}
const nn::hac::ApplicationControlPropertyBinary::sStorageSize& nn::hac::ApplicationControlPropertyBinary::getCacheStorageSize() const
const nn::hac::ApplicationControlProperty::sStorageSize& nn::hac::ApplicationControlProperty::getCacheStorageSize() const
{
return mCacheStorageSize;
}
void nn::hac::ApplicationControlPropertyBinary::setCacheStorageSize(const sStorageSize& var)
void nn::hac::ApplicationControlProperty::setCacheStorageSize(const sStorageSize& var)
{
mCacheStorageSize = var;
}
int64_t nn::hac::ApplicationControlPropertyBinary::getCacheStorageDataAndJournalSizeMax() const
int64_t nn::hac::ApplicationControlProperty::getCacheStorageDataAndJournalSizeMax() const
{
return mCacheStorageDataAndJournalSizeMax;
}
void nn::hac::ApplicationControlPropertyBinary::setCacheStorageDataAndJournalSizeMax(int64_t var)
void nn::hac::ApplicationControlProperty::setCacheStorageDataAndJournalSizeMax(int64_t var)
{
mCacheStorageDataAndJournalSizeMax = var;
}
uint16_t nn::hac::ApplicationControlPropertyBinary::getCacheStorageIndexMax() const
uint16_t nn::hac::ApplicationControlProperty::getCacheStorageIndexMax() const
{
return mCacheStorageIndexMax;
}
void nn::hac::ApplicationControlPropertyBinary::setCacheStorageIndexMax(uint16_t var)
void nn::hac::ApplicationControlProperty::setCacheStorageIndexMax(uint16_t var)
{
mCacheStorageIndexMax = var;
}
const fnd::List<uint64_t>& nn::hac::ApplicationControlPropertyBinary::getPlayLogQueryableApplicationId() const
const fnd::List<uint64_t>& nn::hac::ApplicationControlProperty::getPlayLogQueryableApplicationId() const
{
return mPlayLogQueryableApplicationId;
}
void nn::hac::ApplicationControlPropertyBinary::setPlayLogQueryableApplicationId(const fnd::List<uint64_t>& var)
void nn::hac::ApplicationControlProperty::setPlayLogQueryableApplicationId(const fnd::List<uint64_t>& var)
{
mPlayLogQueryableApplicationId = var;
}
nn::hac::nacp::PlayLogQueryCapability nn::hac::ApplicationControlPropertyBinary::getPlayLogQueryCapability() const
nn::hac::nacp::PlayLogQueryCapability nn::hac::ApplicationControlProperty::getPlayLogQueryCapability() const
{
return mPlayLogQueryCapability;
}
void nn::hac::ApplicationControlPropertyBinary::setPlayLogQueryCapability(nacp::PlayLogQueryCapability var)
void nn::hac::ApplicationControlProperty::setPlayLogQueryCapability(nacp::PlayLogQueryCapability var)
{
mPlayLogQueryCapability = var;
}
nn::hac::nacp::RepairFlag nn::hac::ApplicationControlPropertyBinary::getRepairFlag() const
nn::hac::nacp::RepairFlag nn::hac::ApplicationControlProperty::getRepairFlag() const
{
return mRepairFlag;
}
void nn::hac::ApplicationControlPropertyBinary::setRepairFlag(nacp::RepairFlag var)
void nn::hac::ApplicationControlProperty::setRepairFlag(nacp::RepairFlag var)
{
mRepairFlag = var;
}
byte_t nn::hac::ApplicationControlPropertyBinary::getProgramIndex() const
byte_t nn::hac::ApplicationControlProperty::getProgramIndex() const
{
return mProgramIndex;
}
void nn::hac::ApplicationControlPropertyBinary::setProgramIndex(byte_t var)
void nn::hac::ApplicationControlProperty::setProgramIndex(byte_t var)
{
mProgramIndex = var;
}

View file

@ -274,22 +274,22 @@ void nn::hac::MetaBinary::setProductCode(const std::string & product_code)
mProductCode = product_code;
}
const nn::hac::AccessControlInfoBinary & nn::hac::MetaBinary::getAci() const
const nn::hac::AccessControlInfo & nn::hac::MetaBinary::getAci() const
{
return mAci;
}
void nn::hac::MetaBinary::setAci(const AccessControlInfoBinary & aci)
void nn::hac::MetaBinary::setAci(const AccessControlInfo & aci)
{
mAci = aci;
}
const nn::hac::AccessControlInfoDescBinary & nn::hac::MetaBinary::getAcid() const
const nn::hac::AccessControlInfoDesc & nn::hac::MetaBinary::getAcid() const
{
return mAcid;
}
void nn::hac::MetaBinary::setAcid(const AccessControlInfoDescBinary & acid)
void nn::hac::MetaBinary::setAcid(const AccessControlInfoDesc & acid)
{
mAcid = acid;
}

View file

@ -81,7 +81,7 @@ void MetaProcess::importMeta()
mMeta.fromBytes(scratch.data(), scratch.size());
}
void MetaProcess::validateAcidSignature(const nn::hac::AccessControlInfoDescBinary& acid)
void MetaProcess::validateAcidSignature(const nn::hac::AccessControlInfoDesc& acid)
{
try {
fnd::rsa::sRsa2048Key acid_sign_key;
@ -96,7 +96,7 @@ void MetaProcess::validateAcidSignature(const nn::hac::AccessControlInfoDescBina
}
void MetaProcess::validateAciFromAcid(const nn::hac::AccessControlInfoBinary& aci, const nn::hac::AccessControlInfoDescBinary& acid)
void MetaProcess::validateAciFromAcid(const nn::hac::AccessControlInfo& aci, const nn::hac::AccessControlInfoDesc& acid)
{
// check Program ID
if (acid.getProgramIdRestrict().min > 0 && aci.getProgramId() < acid.getProgramIdRestrict().min)
@ -306,13 +306,13 @@ void MetaProcess::displayMetaHeader(const nn::hac::MetaBinary& hdr)
}
}
void MetaProcess::displayAciHdr(const nn::hac::AccessControlInfoBinary& aci)
void MetaProcess::displayAciHdr(const nn::hac::AccessControlInfo& aci)
{
std::cout << "[Access Control Info]" << std::endl;
std::cout << " ProgramID: 0x" << std::hex << std::setw(16) << std::setfill('0') << aci.getProgramId() << std::endl;
}
void MetaProcess::displayAciDescHdr(const nn::hac::AccessControlInfoDescBinary& acid)
void MetaProcess::displayAciDescHdr(const nn::hac::AccessControlInfoDesc& acid)
{
std::cout << "[Access Control Info Desc]" << std::endl;
if (acid.getFlagList().size() > 0 || _HAS_BIT(mCliOutputMode, OUTPUT_EXTENDED))

View file

@ -34,12 +34,12 @@ private:
void importMeta();
void validateAcidSignature(const nn::hac::AccessControlInfoDescBinary& acid);
void validateAciFromAcid(const nn::hac::AccessControlInfoBinary& aci, const nn::hac::AccessControlInfoDescBinary& acid);
void validateAcidSignature(const nn::hac::AccessControlInfoDesc& acid);
void validateAciFromAcid(const nn::hac::AccessControlInfo& aci, const nn::hac::AccessControlInfoDesc& acid);
void displayMetaHeader(const nn::hac::MetaBinary& hdr);
void displayAciHdr(const nn::hac::AccessControlInfoBinary& aci);
void displayAciDescHdr(const nn::hac::AccessControlInfoDescBinary& aci);
void displayAciHdr(const nn::hac::AccessControlInfo& aci);
void displayAciDescHdr(const nn::hac::AccessControlInfoDesc& aci);
void displayFac(const nn::hac::FileSystemAccessControlBinary& fac);
void displaySac(const nn::hac::ServiceAccessControlBinary& sac);
void displayKernelCap(const nn::hac::KernelCapabilityBinary& kern);

View file

@ -35,7 +35,7 @@ void NacpProcess::setVerifyMode(bool verify)
mVerify = verify;
}
const nn::hac::ApplicationControlPropertyBinary& NacpProcess::getApplicationControlPropertyBinary() const
const nn::hac::ApplicationControlProperty& NacpProcess::getApplicationControlProperty() const
{
return mNacp;
}

View file

@ -3,7 +3,7 @@
#include <fnd/types.h>
#include <fnd/IFile.h>
#include <fnd/SharedPtr.h>
#include <nn/hac/ApplicationControlPropertyBinary.h>
#include <nn/hac/ApplicationControlProperty.h>
#include "common.h"
@ -18,7 +18,7 @@ public:
void setCliOutputMode(CliOutputMode type);
void setVerifyMode(bool verify);
const nn::hac::ApplicationControlPropertyBinary& getApplicationControlPropertyBinary() const;
const nn::hac::ApplicationControlProperty& getApplicationControlProperty() const;
private:
const std::string kModuleName = "NacpProcess";
@ -27,7 +27,7 @@ private:
CliOutputMode mCliOutputMode;
bool mVerify;
nn::hac::ApplicationControlPropertyBinary mNacp;
nn::hac::ApplicationControlProperty mNacp;
void importNacp();
void displayNacp();