openharmony/telephony_core_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/telephony_core_service synced 2024-11-26 17:50:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2397 euiccinfo2 merge and authen encode

Browse Source 
Merge pull request !2397 from wangyi175/master
This commit is contained in:
openharmony_ci 2024-10-26 13:28:51 +00:00 committed by Gitee
commit bd9c678996
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/sim/include/esim_file.h
View File

@ -57,6 +57,7 @@ static std::string ISDR_AID = "A0000005591010FFFFFFFF8900000100";
constexpr static const int32_t ATR_LENGTH = 47;
constexpr static const uint32_t OFFSET_FOUR_BIT = 4;
constexpr static const uint32_t VERSION_NUMBER = 11;
constexpr static const uint32_t AUTH_SERVER_TAC_LEN = 4;
class EsimFile : public IccFile {
public:
explicit EsimFile(std::shared_ptr<SimStateManager> simStateManager);

22
services/sim/src/esim_file.cpp
View File

@ -2650,6 +2650,7 @@ EuiccInfo2 EsimFile::ObtainEuiccInfo2(int32_t portIndex)
esimProfile_.portIndex = portIndex;
SyncOpenChannel();
AppExecFwk::InnerEvent::Pointer eventEUICCInfo2 = BuildCallerInfo(MSG_ESIM_OBTAIN_EUICC_INFO2_DONE);
recvCombineStr_ = "";
if (!ProcessObtainEuiccInfo2(slotId_, eventEUICCInfo2)) {
TELEPHONY_LOGE("ProcessObtainEuiccInfo2 encode failed");
return EuiccInfo2();
@ -2774,6 +2775,8 @@ void EsimFile::AddDeviceCapability(std::shared_ptr<Asn1Builder> &devCapsBuilder)
{
std::vector<uint8_t> versionBytes;
Asn1Utils::UintToBytes(VERSION_NUMBER, versionBytes);
versionBytes.push_back(0);
versionBytes.push_back(0);
devCapsBuilder->Asn1AddChildAsBytes(TAG_ESIM_CTX_0, versionBytes, versionBytes.size());
devCapsBuilder->Asn1AddChildAsBytes(TAG_ESIM_CTX_1, versionBytes, versionBytes.size());
devCapsBuilder->Asn1AddChildAsBytes(TAG_ESIM_CTX_5, versionBytes, versionBytes.size());
@ -2804,9 +2807,14 @@ void EsimFile::AddCtxParams1(std::shared_ptr<Asn1Builder> &ctxParams1Builder, Es
}
ctxParams1Builder->Asn1AddChildAsString(TAG_ESIM_CTX_0, pbytes.matchingId);
std::shared_ptr<Asn1Node> subNode = nullptr;
std::vector<uint8_t> tacBytes;
std::vector<uint8_t> tmpBytes;
std::vector<uint8_t> imeiBytes;
Asn1Utils::BcdToBytes(pbytes.imei, tacBytes);
Asn1Utils::BcdToBytes(pbytes.imei, tmpBytes);
if (tmpBytes.size() < AUTH_SERVER_TAC_LEN) {
TELEPHONY_LOGE("tmpBytes.size is small than AUTH_SERVER_TAC_LEN");
return;
}
std::vector<uint8_t> tacBytes(tmpBytes.begin(), tmpBytes.begin() + AUTH_SERVER_TAC_LEN);
GetImeiBytes(imeiBytes, pbytes.imei);
std::shared_ptr<Asn1Builder> subBuilder = std::make_shared<Asn1Builder>(TAG_ESIM_CTX_COMP_1);
if (subBuilder == nullptr) {
@ -2843,11 +2851,11 @@ bool EsimFile::ProcessObtainEuiccInfo2Done(const AppExecFwk::InnerEvent::Pointer
TELEPHONY_LOGE("rcvMsg is nullptr");
return false;
}
IccFileData *result = &(rcvMsg->fileData);
if (result == nullptr) {
return false;
IccFileData &result = rcvMsg->fileData;
if (!MergeRecvLongDataComplete(result, MSG_ESIM_OBTAIN_EUICC_INFO2_DONE)) {
return true;
}
std::vector<uint8_t> responseByte = Asn1Utils::HexStrToBytes(result->resultData);
std::vector<uint8_t> responseByte = Asn1Utils::HexStrToBytes(recvCombineStr_);
uint32_t byteLen = responseByte.size();
std::shared_ptr<Asn1Node> root = Asn1ParseResponse(responseByte, byteLen);
if (root == nullptr) {
@ -2867,7 +2875,7 @@ bool EsimFile::ProcessObtainEuiccInfo2Done(const AppExecFwk::InnerEvent::Pointer
this->EuiccInfo2ParseEuiccCategory(euiccInfo2Result_, root);
this->EuiccInfo2ParsePpVersion(euiccInfo2Result_, root);
euiccInfo2Result_.resultCode_ = ResultState::RESULT_OK;
euiccInfo2Result_.response_ = result->resultData;
euiccInfo2Result_.response_ = result.resultData;
{
std::lock_guard<std::mutex> lock(euiccInfo2Mutex_);
isEuiccInfo2Ready_ = true;