More fixing of Android CI

project-chip · Mar 29, 2022 · d74fd8b · d74fd8b
1 parent f4d86cb
commit d74fd8b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/controller/ExampleOperationalCredentialsIssuer.cpp b/src/controller/ExampleOperationalCredentialsIssuer.cpp
@@ -234,7 +234,7 @@ CHIP_ERROR ExampleOperationalCredentialsIssuer::GenerateNOCChain(const ByteSpan
  // TODO: Force callers to set IPK if used before GenerateNOCChain will succeed.
  ByteSpan defaultIpkSpan = chip::GroupTesting::DefaultIpkValue::GetDefaultIpk();
 
- // The below static assert
+ // The below static assert validates a key assumption in types used (needed for public API conformance)
  static_assert(CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES == kAES_CCM128_Key_Length, "IPK span sizing must match");
 
  // Prepare IPK to be sent back. A more fully-fledged operational credentials delegate

diff --git a/src/controller/java/AndroidOperationalCredentialsIssuer.cpp b/src/controller/java/AndroidOperationalCredentialsIssuer.cpp
@@ -26,6 +26,7 @@
 #include <lib/support/PersistentStorageMacros.h>
 #include <lib/support/SafeInt.h>
 #include <lib/support/ScopedBuffer.h>
+#include <lib/support/TestGroupData.h>
 
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
@@ -181,8 +182,25 @@ CHIP_ERROR AndroidOperationalCredentialsIssuer::GenerateNOCChain(const ByteSpan
  ReturnErrorOnFailure(
  GenerateNOCChainAfterValidation(assignedId, mNextFabricId, chip::kUndefinedCATs, pubkey, rcacSpan, icacSpan, nocSpan));
 
- onCompletion->mCall(onCompletion->mContext, CHIP_NO_ERROR, nocSpan, ByteSpan(), rcacSpan, Optional<AesCcm128KeySpan>(),
- Optional<NodeId>());
+ // TODO: Force callers to set IPK if used before GenerateNOCChain will succeed.
+ ByteSpan defaultIpkSpan = chip::GroupTesting::DefaultIpkValue::GetDefaultIpk();
+
+ // The below static assert validates a key assumption in types used (needed for public API conformance)
+ static_assert(CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES == kAES_CCM128_Key_Length, "IPK span sizing must match");
+
+ // Prepare IPK to be sent back. A more fully-fledged operational credentials delegate
+ // would obtain a suitable key per fabric.
+ uint8_t ipkValue[CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES];
+ Crypto::AesCcm128KeySpan ipkSpan(ipkValue);
+
+ ReturnErrorCodeIf(defaultIpkSpan.size() != sizeof(ipkValue), CHIP_ERROR_INTERNAL);
+
+ memcpy(&ipkValue[0], defaultIpkSpan.data(), defaultIpkSpan.size());
+ Optional<Crypto::AesCcm128KeySpan> ipkSpanValue;
+ ipkSpanValue.SetValue(ipkSpan);
+
+ // Call-back into commissioner with the generated data.
+ onCompletion->mCall(onCompletion->mContext, CHIP_NO_ERROR, nocSpan, ByteSpan(), rcacSpan, ipkSpanValue, Optional<NodeId>());
 
  jbyteArray javaCsr;
  JniReferences::GetInstance().GetEnvForCurrentThread()->ExceptionClear();