Skip to content

Commit

Permalink
Merge pull request #197 from joonhaengHeo/fix_android_external_noc_issue
Browse files Browse the repository at this point in the history 
Fix android external noc issue
  • Loading branch information
@joonhaengHeo
joonhaengHeo authored Mar 7, 2024
2 parents 6fbffcb + 3d6ea89 commit 743fd4a
Showing 1 changed file with 52 additions and 36 deletions.
88 changes: 52 additions & 36 deletions src/controller/java/CHIPDeviceController-JNI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,44 +171,54 @@ JNI_METHOD(jint, onNOCChainGeneration)
ChipLogProgress(Controller, "setNOCChain() called");

jmethodID getRootCertificate;
jmethodID getIntermediateCertificate;
jmethodID getOperationalCertificate;
jmethodID getIpk;
jmethodID getAdminSubject;

jbyteArray rootCertificate = nullptr;
jbyteArray intermediateCertificate = nullptr;
jbyteArray operationalCertificate = nullptr;
jbyteArray ipk = nullptr;

Optional<NodeId> adminSubjectOptional;
uint64_t adminSubject = chip::kUndefinedNodeId;

CommissioningParameters commissioningParams = wrapper->GetCommissioningParameters();

Optional<Crypto::IdentityProtectionKeySpan> ipkOptional;
uint8_t ipkValue[CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES];
Crypto::IdentityProtectionKeySpan ipkTempSpan(ipkValue);

VerifyOrExit(controllerParams != nullptr, ChipLogError(Controller, "controllerParams is null!"));

err = chip::JniReferences::GetInstance().FindMethod(env, controllerParams, "getRootCertificate", "()[B", &getRootCertificate);
VerifyOrReturnValue(err == CHIP_NO_ERROR, static_cast<jint>(err.AsInteger()));
VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Find getRootCertificate method fail!"));

jmethodID getIntermediateCertificate;
err = chip::JniReferences::GetInstance().FindMethod(env, controllerParams, "getIntermediateCertificate", "()[B",
&getIntermediateCertificate);
VerifyOrReturnValue(err == CHIP_NO_ERROR, static_cast<jint>(err.AsInteger()));
VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Find getIntermediateCertificate method fail!"));

jmethodID getOperationalCertificate;
err = chip::JniReferences::GetInstance().FindMethod(env, controllerParams, "getOperationalCertificate", "()[B",
&getOperationalCertificate);
VerifyOrReturnValue(err == CHIP_NO_ERROR, static_cast<jint>(err.AsInteger()));
VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Find getOperationalCertificate method fail!"));

jmethodID getIpk;
err = chip::JniReferences::GetInstance().FindMethod(env, controllerParams, "getIpk", "()[B", &getIpk);
VerifyOrReturnValue(err == CHIP_NO_ERROR, static_cast<jint>(err.AsInteger()));
VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Find getIpk method fail!"));

jmethodID getAdminSubject;
err = chip::JniReferences::GetInstance().FindMethod(env, controllerParams, "getAdminSubject", "()J", &getAdminSubject);
VerifyOrReturnValue(err == CHIP_NO_ERROR, static_cast<jint>(err.AsInteger()));

jbyteArray rootCertificate = (jbyteArray) env->CallObjectMethod(controllerParams, getRootCertificate);
VerifyOrReturnValue(rootCertificate != nullptr, static_cast<jint>(CHIP_ERROR_BAD_REQUEST.AsInteger()));
VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Find getAdminSubject method fail!"));

jbyteArray intermediateCertificate = (jbyteArray) env->CallObjectMethod(controllerParams, getIntermediateCertificate);
VerifyOrReturnValue(intermediateCertificate != nullptr, static_cast<jint>(CHIP_ERROR_BAD_REQUEST.AsInteger()));
rootCertificate = static_cast<jbyteArray>(env->CallObjectMethod(controllerParams, getRootCertificate));
VerifyOrExit(rootCertificate != nullptr, err = CHIP_ERROR_BAD_REQUEST);

jbyteArray operationalCertificate = (jbyteArray) env->CallObjectMethod(controllerParams, getOperationalCertificate);
VerifyOrReturnValue(operationalCertificate != nullptr, static_cast<jint>(CHIP_ERROR_BAD_REQUEST.AsInteger()));
intermediateCertificate = static_cast<jbyteArray>(env->CallObjectMethod(controllerParams, getIntermediateCertificate));
VerifyOrExit(intermediateCertificate != nullptr, err = CHIP_ERROR_BAD_REQUEST);

// use ipk and adminSubject from CommissioningParameters if not set in ControllerParams
CommissioningParameters commissioningParams = wrapper->GetCommissioningParameters();
operationalCertificate = static_cast<jbyteArray>(env->CallObjectMethod(controllerParams, getOperationalCertificate));
VerifyOrExit(operationalCertificate != nullptr, err = CHIP_ERROR_BAD_REQUEST);

Optional<Crypto::IdentityProtectionKeySpan> ipkOptional;
uint8_t ipkValue[CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES];
Crypto::IdentityProtectionKeySpan ipkTempSpan(ipkValue);

jbyteArray ipk = (jbyteArray) env->CallObjectMethod(controllerParams, getIpk);
ipk = static_cast<jbyteArray>(env->CallObjectMethod(controllerParams, getIpk));
if (ipk != nullptr)
{
JniByteArray jByteArrayIpk(env, ipk);
Expand All @@ -217,7 +227,7 @@ JNI_METHOD(jint, onNOCChainGeneration)
{
ChipLogError(Controller, "Invalid IPK size %u and expect %u", static_cast<unsigned>(jByteArrayIpk.byteSpan().size()),
static_cast<unsigned>(sizeof(ipkValue)));
return CHIP_ERROR_INVALID_IPK.AsInteger();
ExitNow(err = CHIP_ERROR_INVALID_IPK);
}
memcpy(&ipkValue[0], jByteArrayIpk.byteSpan().data(), jByteArrayIpk.byteSpan().size());

Expand All @@ -229,8 +239,7 @@ JNI_METHOD(jint, onNOCChainGeneration)
ipkOptional.SetValue(commissioningParams.GetIpk().Value());
}

Optional<NodeId> adminSubjectOptional;
uint64_t adminSubject = static_cast<uint64_t>(env->CallLongMethod(controllerParams, getAdminSubject));
adminSubject = static_cast<uint64_t>(env->CallLongMethod(controllerParams, getAdminSubject));
if (adminSubject == kUndefinedNodeId)
{
// if no value pass in ControllerParams, use value from CommissioningParameters
Expand All @@ -243,20 +252,27 @@ JNI_METHOD(jint, onNOCChainGeneration)
// NOTE: we are allowing adminSubject to not be set since the OnNOCChainGeneration callback makes this field
// optional and includes logic to handle the case where it is not set. It would also make sense to return
// an error here since that use case may not be realistic.

JniByteArray jByteArrayRcac(env, rootCertificate);
JniByteArray jByteArrayIcac(env, intermediateCertificate);
JniByteArray jByteArrayNoc(env, operationalCertificate);
{
JniByteArray jByteArrayRcac(env, rootCertificate);
JniByteArray jByteArrayIcac(env, intermediateCertificate);
JniByteArray jByteArrayNoc(env, operationalCertificate);

#ifndef JAVA_MATTER_CONTROLLER_TEST
err = wrapper->GetAndroidOperationalCredentialsIssuer()->NOCChainGenerated(CHIP_NO_ERROR, jByteArrayNoc.byteSpan(),
jByteArrayIcac.byteSpan(), jByteArrayRcac.byteSpan(),
ipkOptional, adminSubjectOptional);
err = wrapper->GetAndroidOperationalCredentialsIssuer()->NOCChainGenerated(
CHIP_NO_ERROR, jByteArrayNoc.byteSpan(), jByteArrayIcac.byteSpan(), jByteArrayRcac.byteSpan(), ipkOptional,
adminSubjectOptional);

if (err != CHIP_NO_ERROR)
{
ChipLogError(Controller, "Failed to SetNocChain for the device: %" CHIP_ERROR_FORMAT, err.Format());
if (err != CHIP_NO_ERROR)
{
ChipLogError(Controller, "Failed to SetNocChain for the device: %" CHIP_ERROR_FORMAT, err.Format());
}
return static_cast<jint>(err.AsInteger());
#endif // JAVA_MATTER_CONTROLLER_TEST
}
exit:
#ifndef JAVA_MATTER_CONTROLLER_TEST
err = wrapper->GetAndroidOperationalCredentialsIssuer()->NOCChainGenerated(err, ByteSpan(), ByteSpan(), ByteSpan(), ipkOptional,
adminSubjectOptional);
#endif // JAVA_MATTER_CONTROLLER_TEST
return static_cast<jint>(err.AsInteger());
}
Expand Down

0 comments on commit 743fd4a

Please sign in to comment.