diff --git a/services/key_enable/config/openharmony/trusted_cert_path.json b/services/key_enable/config/openharmony/trusted_cert_path.json index 623cc224d5cdc54f6f1120109c7fd56dc1462931..6df369b4829ee43141da8b950ce4e51b35236630 100644 --- a/services/key_enable/config/openharmony/trusted_cert_path.json +++ b/services/key_enable/config/openharmony/trusted_cert_path.json @@ -88,7 +88,7 @@ }, { "mode":"Dev", - "type":"Debug", + "type":"Platform", "subject":"C=CN, O=Huawei, OU=Huawei CBG, CN=HarmonyOS SDK debug tools", "issuer":"C=CN, O=Huawei, OU=Huawei CBG, CN=Huawei CBG Software Signing Service CA", "max-certs-path":3 diff --git a/services/key_enable/config/trusted_cert_path.json b/services/key_enable/config/trusted_cert_path.json index e09bf767cbd479541a502bb46fb128069ea026c9..2b843e23eef492d816d77cc6ab99d7c236b7dd5a 100644 --- a/services/key_enable/config/trusted_cert_path.json +++ b/services/key_enable/config/trusted_cert_path.json @@ -81,7 +81,7 @@ }, { "mode":"Dev", - "type":"Debug", + "type":"Platform", "subject":"C=CN, O=Huawei, OU=Huawei CBG, CN=HarmonyOS SDK debug tools", "issuer":"C=CN, O=Huawei, OU=Huawei CBG, CN=Huawei CBG Software Signing Service CA", "max-certs-path":3 diff --git a/utils/src/code_sign_block.cpp b/utils/src/code_sign_block.cpp index bb3942f8d5cf095c7cc5848429242f4643259f1e..0525f04188a4a94de35298f69777423d32fb3242 100644 --- a/utils/src/code_sign_block.cpp +++ b/utils/src/code_sign_block.cpp @@ -95,7 +95,7 @@ int32_t CodeSignBlock::ParseNativeLibSignInfo(const EntryMap &entryMap) auto soInfo = GetNativeLibSignInfo(); LOG_DEBUG(LABEL, "So info sectionNum:%{public}d, entryMap size:%{public}u", soInfo->sectionNum, static_cast(entryMap.size())); - if ((soInfo->sectionNum == 0) || entryMap.empty()) { + if ((soInfo->sectionNum == 0) && entryMap.empty()) { return CS_SUCCESS; } else if (!entryMap.empty() && (soInfo->sectionNum == 0)) { return CS_ERR_NO_SIGNATURE; diff --git a/utils/src/signer_info.cpp b/utils/src/signer_info.cpp index ea2d00abbd2938389bf964d681de5669ff151ad6..4205e1a6bfd95c0dec705f1feb38c66928414aa1 100644 --- a/utils/src/signer_info.cpp +++ b/utils/src/signer_info.cpp @@ -275,7 +275,7 @@ int SignerInfo::ParseOwnerIdFromSignature(const ByteBuffer &sigbuffer, std::stri ASN1_TYPE *asn1Type = PKCS7_get_signed_attribute(signerInfo, nid); if (asn1Type != nullptr && asn1Type->type == V_ASN1_UTF8STRING) { ASN1_STRING *result = asn1Type->value.asn1_string; - ownerID.assign((const char *)ASN1_STRING_get0_data(result), ASN1_STRING_length(result)); + ownerID.assign(reinterpret_cast(ASN1_STRING_get0_data(result)), ASN1_STRING_length(result)); break; } }