src/crypto/tests/TestPersistentStorageOpKeyStore.cpp - third_party/github/project-chip/connectedhomeip - Git at Google

 /*
  *
  *    Copyright (c) 2022 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
  *    You may obtain a copy of the License at
  *
  *        http://www.apache.org/licenses/LICENSE-2.0
  *
  *    Unless required by applicable law or agreed to in writing, software
  *    distributed under the License is distributed on an "AS IS" BASIS,
  *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */

 #include <inttypes.h>

 #include <crypto/PersistentStorageOperationalKeystore.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/DefaultStorageKeyAllocator.h>
 #include <lib/support/Span.h>
 #include <lib/support/TestPersistentStorageDelegate.h>
 #include <lib/support/UnitTestExtendedAssertions.h>
 #include <lib/support/UnitTestRegistration.h>
 #include <nlunit-test.h>

 using namespace chip;
 using namespace chip::Crypto;

 namespace {

 void TestBasicLifeCycle(nlTestSuite * inSuite, void * inContext)
 {
     TestPersistentStorageDelegate storageDelegate;
     PersistentStorageOperationalKeystore opKeystore;

     FabricIndex kFabricIndex    = 111;
     FabricIndex kBadFabricIndex = static_cast<FabricIndex>(kFabricIndex + 10u);

     // Failure before Init of ActivateOpKeypairForFabric
     P256PublicKey placeHolderPublicKey;
     CHIP_ERROR err = opKeystore.ActivateOpKeypairForFabric(kFabricIndex, placeHolderPublicKey);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);
     NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);

     // Failure before Init of NewOpKeypairForFabric
     uint8_t unusedCsrBuf[kMAX_CSR_Length];
     MutableByteSpan unusedCsrSpan{ unusedCsrBuf };
     err = opKeystore.NewOpKeypairForFabric(kFabricIndex, unusedCsrSpan);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);

     // Failure before Init of CommitOpKeypairForFabric
     err = opKeystore.CommitOpKeypairForFabric(kFabricIndex);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);

     // Failure before Init of RemoveOpKeypairForFabric
     err = opKeystore.RemoveOpKeypairForFabric(kFabricIndex);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);

     // Success after Init
     err = opKeystore.Init(&storageDelegate);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

     // Can generate a key and get a CSR
     uint8_t csrBuf[kMAX_CSR_Length];
     MutableByteSpan csrSpan{ csrBuf };
     err = opKeystore.NewOpKeypairForFabric(kFabricIndex, csrSpan);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
     NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);

     P256PublicKey csrPublicKey1;
     err = VerifyCertificateSigningRequest(csrSpan.data(), csrSpan.size(), csrPublicKey1);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite, csrPublicKey1.Matches(csrPublicKey1));

     // Can regenerate a second CSR and it has different PK
     csrSpan = MutableByteSpan{ csrBuf };
     err     = opKeystore.NewOpKeypairForFabric(kFabricIndex, csrSpan);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);

     // Cannot NewOpKeypair for a different fabric if one already pending
     uint8_t badCsrBuf[kMAX_CSR_Length];
     MutableByteSpan badCsrSpan = MutableByteSpan{ badCsrBuf };
     err                        = opKeystore.NewOpKeypairForFabric(kBadFabricIndex, badCsrSpan);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);

     P256PublicKey csrPublicKey2;
     err = VerifyCertificateSigningRequest(csrSpan.data(), csrSpan.size(), csrPublicKey2);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite, !csrPublicKey1.Matches(csrPublicKey2));

     // Fail to generate CSR for invalid fabrics
     csrSpan = MutableByteSpan{ csrBuf };
     err     = opKeystore.NewOpKeypairForFabric(kUndefinedFabricIndex, csrSpan);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);

     csrSpan = MutableByteSpan{ csrBuf };
     err     = opKeystore.NewOpKeypairForFabric(kMaxValidFabricIndex + 1, csrSpan);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);

     // No storage done by NewOpKeypairForFabric
     NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
     NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);

     // Even after error, the previous valid pending keypair stays valid.
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);

     // Activating with mismatching fabricIndex and matching public key fails
     err = opKeystore.ActivateOpKeypairForFabric(kBadFabricIndex, csrPublicKey2);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
     NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
     NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);

     // Activating with matching fabricIndex and mismatching public key fails
     err = opKeystore.ActivateOpKeypairForFabric(kFabricIndex, csrPublicKey1);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_PUBLIC_KEY);
     NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
     NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);

     uint8_t message[] = { 1, 2, 3, 4 };
     P256ECDSASignature sig1;
     // Before successful activation, cannot sign
     err = opKeystore.SignWithOpKeypair(kFabricIndex, ByteSpan{ message }, sig1);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);

     // Activating with matching fabricIndex and matching public key succeeds
     err = opKeystore.ActivateOpKeypairForFabric(kFabricIndex, csrPublicKey2);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

     // Activating does not store, and keeps pending
     NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
     NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == true);
     NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kBadFabricIndex) == false);

     // Can't sign for wrong fabric after activation
     P256ECDSASignature sig2;
     err = opKeystore.SignWithOpKeypair(kBadFabricIndex, ByteSpan{ message }, sig2);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);

     // Can sign after activation
     err = opKeystore.SignWithOpKeypair(kFabricIndex, ByteSpan{ message }, sig2);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

     // Signature matches pending key
     err = csrPublicKey2.ECDSA_validate_msg_signature(message, sizeof(message), sig2);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

     // Signature does not match a previous pending key
     err = csrPublicKey1.ECDSA_validate_msg_signature(message, sizeof(message), sig2);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_SIGNATURE);

     // Committing with mismatching fabric fails, leaves pending
     err = opKeystore.CommitOpKeypairForFabric(kBadFabricIndex);
     NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
     NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
     NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == true);

     // Committing key resets pending state and adds storage
     DefaultStorageKeyAllocator keyAllocator;
     std::string opKeyStorageKey = keyAllocator.FabricOpKey(kFabricIndex);
     err                         = opKeystore.CommitOpKeypairForFabric(kFabricIndex);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == false);
     NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 1);
     NL_TEST_ASSERT(inSuite, storageDelegate.HasKey(opKeyStorageKey) == true);

     // After committing, signing works with the key that was pending
     P256ECDSASignature sig3;
     uint8_t message2[] = { 10, 11, 12, 13 };
     err                = opKeystore.SignWithOpKeypair(kFabricIndex, ByteSpan{ message2 }, sig3);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

     err = csrPublicKey2.ECDSA_validate_msg_signature(message2, sizeof(message2), sig3);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

     // Let's remove the opkey for a fabric, it disappears
     err = opKeystore.RemoveOpKeypairForFabric(kFabricIndex);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == false);
     NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);
     NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
     NL_TEST_ASSERT(inSuite, storageDelegate.HasKey(opKeyStorageKey) == false);

     opKeystore.Finish();
 }

 void TestEphemeralKeys(nlTestSuite * inSuite, void * inContext)
 {
     chip::TestPersistentStorageDelegate storage;

     PersistentStorageOperationalKeystore opKeyStore;
     NL_TEST_ASSERT_SUCCESS(inSuite, opKeyStore.Init(&storage));

     Crypto::P256ECDSASignature sig;
     uint8_t message[] = { 'm', 's', 'g' };

     Crypto::P256Keypair * ephemeralKeypair = opKeyStore.AllocateEphemeralKeypairForCASE();
     NL_TEST_ASSERT(inSuite, ephemeralKeypair != nullptr);
     NL_TEST_ASSERT_SUCCESS(inSuite, ephemeralKeypair->Initialize());

     NL_TEST_ASSERT_SUCCESS(inSuite, ephemeralKeypair->ECDSA_sign_msg(message, sizeof(message), sig));
     NL_TEST_ASSERT_SUCCESS(inSuite, ephemeralKeypair->Pubkey().ECDSA_validate_msg_signature(message, sizeof(message), sig));

     opKeyStore.ReleaseEphemeralKeypair(ephemeralKeypair);

     opKeyStore.Finish();
 }

 /**
  *   Test Suite. It lists all the test functions.
  */
 static const nlTest sTests[] = { NL_TEST_DEF("Test Basic Lifecycle of PersistentStorageOperationalKeystore", TestBasicLifeCycle),
                                  NL_TEST_DEF("Test ephemeral key management", TestEphemeralKeys), NL_TEST_SENTINEL() };

 /**
  *  Set up the test suite.
  */
 int Test_Setup(void * inContext)
 {
     CHIP_ERROR error = chip::Platform::MemoryInit();
     VerifyOrReturnError(error == CHIP_NO_ERROR, FAILURE);
     return SUCCESS;
 }

 /**
  *  Tear down the test suite.
  */
 int Test_Teardown(void * inContext)
 {
     chip::Platform::MemoryShutdown();
     return SUCCESS;
 }

 } // namespace

 /**
  *  Main
  */
 int TestPersistentStorageOperationalKeystore()
 {
     nlTestSuite theSuite = { "PersistentStorageOperationalKeystore tests", &sTests[0], Test_Setup, Test_Teardown };

     // Run test suite againt one context.
     nlTestRunner(&theSuite, nullptr);
     return nlTestRunnerStats(&theSuite);
 }

 CHIP_REGISTER_TEST_SUITE(TestPersistentStorageOperationalKeystore)
	/*
	*
	* Copyright (c) 2022 Project CHIP Authors
	* All rights reserved.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	#include <inttypes.h>

	#include <crypto/PersistentStorageOperationalKeystore.h>
	#include <lib/support/CHIPMem.h>
	#include <lib/support/CodeUtils.h>
	#include <lib/support/DefaultStorageKeyAllocator.h>
	#include <lib/support/Span.h>
	#include <lib/support/TestPersistentStorageDelegate.h>
	#include <lib/support/UnitTestExtendedAssertions.h>
	#include <lib/support/UnitTestRegistration.h>
	#include <nlunit-test.h>

	using namespace chip;
	using namespace chip::Crypto;

	namespace {

	void TestBasicLifeCycle(nlTestSuite * inSuite, void * inContext)
	{
	TestPersistentStorageDelegate storageDelegate;
	PersistentStorageOperationalKeystore opKeystore;

	FabricIndex kFabricIndex = 111;
	FabricIndex kBadFabricIndex = static_cast<FabricIndex>(kFabricIndex + 10u);

	// Failure before Init of ActivateOpKeypairForFabric
	P256PublicKey placeHolderPublicKey;
	CHIP_ERROR err = opKeystore.ActivateOpKeypairForFabric(kFabricIndex, placeHolderPublicKey);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);
	NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);

	// Failure before Init of NewOpKeypairForFabric
	uint8_t unusedCsrBuf[kMAX_CSR_Length];
	MutableByteSpan unusedCsrSpan{ unusedCsrBuf };
	err = opKeystore.NewOpKeypairForFabric(kFabricIndex, unusedCsrSpan);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);

	// Failure before Init of CommitOpKeypairForFabric
	err = opKeystore.CommitOpKeypairForFabric(kFabricIndex);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);

	// Failure before Init of RemoveOpKeypairForFabric
	err = opKeystore.RemoveOpKeypairForFabric(kFabricIndex);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INCORRECT_STATE);

	// Success after Init
	err = opKeystore.Init(&storageDelegate);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

	// Can generate a key and get a CSR
	uint8_t csrBuf[kMAX_CSR_Length];
	MutableByteSpan csrSpan{ csrBuf };
	err = opKeystore.NewOpKeypairForFabric(kFabricIndex, csrSpan);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
	NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);

	P256PublicKey csrPublicKey1;
	err = VerifyCertificateSigningRequest(csrSpan.data(), csrSpan.size(), csrPublicKey1);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
	NL_TEST_ASSERT(inSuite, csrPublicKey1.Matches(csrPublicKey1));

	// Can regenerate a second CSR and it has different PK
	csrSpan = MutableByteSpan{ csrBuf };
	err = opKeystore.NewOpKeypairForFabric(kFabricIndex, csrSpan);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);

	// Cannot NewOpKeypair for a different fabric if one already pending
	uint8_t badCsrBuf[kMAX_CSR_Length];
	MutableByteSpan badCsrSpan = MutableByteSpan{ badCsrBuf };
	err = opKeystore.NewOpKeypairForFabric(kBadFabricIndex, badCsrSpan);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);

	P256PublicKey csrPublicKey2;
	err = VerifyCertificateSigningRequest(csrSpan.data(), csrSpan.size(), csrPublicKey2);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
	NL_TEST_ASSERT(inSuite, !csrPublicKey1.Matches(csrPublicKey2));

	// Fail to generate CSR for invalid fabrics
	csrSpan = MutableByteSpan{ csrBuf };
	err = opKeystore.NewOpKeypairForFabric(kUndefinedFabricIndex, csrSpan);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);

	csrSpan = MutableByteSpan{ csrBuf };
	err = opKeystore.NewOpKeypairForFabric(kMaxValidFabricIndex + 1, csrSpan);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);

	// No storage done by NewOpKeypairForFabric
	NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
	NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);

	// Even after error, the previous valid pending keypair stays valid.
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);

	// Activating with mismatching fabricIndex and matching public key fails
	err = opKeystore.ActivateOpKeypairForFabric(kBadFabricIndex, csrPublicKey2);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
	NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
	NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);

	// Activating with matching fabricIndex and mismatching public key fails
	err = opKeystore.ActivateOpKeypairForFabric(kFabricIndex, csrPublicKey1);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_PUBLIC_KEY);
	NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
	NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);

	uint8_t message[] = { 1, 2, 3, 4 };
	P256ECDSASignature sig1;
	// Before successful activation, cannot sign
	err = opKeystore.SignWithOpKeypair(kFabricIndex, ByteSpan{ message }, sig1);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);

	// Activating with matching fabricIndex and matching public key succeeds
	err = opKeystore.ActivateOpKeypairForFabric(kFabricIndex, csrPublicKey2);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

	// Activating does not store, and keeps pending
	NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
	NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == true);
	NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kBadFabricIndex) == false);

	// Can't sign for wrong fabric after activation
	P256ECDSASignature sig2;
	err = opKeystore.SignWithOpKeypair(kBadFabricIndex, ByteSpan{ message }, sig2);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);

	// Can sign after activation
	err = opKeystore.SignWithOpKeypair(kFabricIndex, ByteSpan{ message }, sig2);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

	// Signature matches pending key
	err = csrPublicKey2.ECDSA_validate_msg_signature(message, sizeof(message), sig2);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

	// Signature does not match a previous pending key
	err = csrPublicKey1.ECDSA_validate_msg_signature(message, sizeof(message), sig2);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_SIGNATURE);

	// Committing with mismatching fabric fails, leaves pending
	err = opKeystore.CommitOpKeypairForFabric(kBadFabricIndex);
	NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_FABRIC_INDEX);
	NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == true);
	NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == true);

	// Committing key resets pending state and adds storage
	DefaultStorageKeyAllocator keyAllocator;
	std::string opKeyStorageKey = keyAllocator.FabricOpKey(kFabricIndex);
	err = opKeystore.CommitOpKeypairForFabric(kFabricIndex);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == false);
	NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 1);
	NL_TEST_ASSERT(inSuite, storageDelegate.HasKey(opKeyStorageKey) == true);

	// After committing, signing works with the key that was pending
	P256ECDSASignature sig3;
	uint8_t message2[] = { 10, 11, 12, 13 };
	err = opKeystore.SignWithOpKeypair(kFabricIndex, ByteSpan{ message2 }, sig3);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

	err = csrPublicKey2.ECDSA_validate_msg_signature(message2, sizeof(message2), sig3);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);

	// Let's remove the opkey for a fabric, it disappears
	err = opKeystore.RemoveOpKeypairForFabric(kFabricIndex);
	NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
	NL_TEST_ASSERT(inSuite, opKeystore.HasPendingOpKeypair() == false);
	NL_TEST_ASSERT(inSuite, opKeystore.HasOpKeypairForFabric(kFabricIndex) == false);
	NL_TEST_ASSERT(inSuite, storageDelegate.GetNumKeys() == 0);
	NL_TEST_ASSERT(inSuite, storageDelegate.HasKey(opKeyStorageKey) == false);

	opKeystore.Finish();
	}

	void TestEphemeralKeys(nlTestSuite * inSuite, void * inContext)
	{
	chip::TestPersistentStorageDelegate storage;

	PersistentStorageOperationalKeystore opKeyStore;
	NL_TEST_ASSERT_SUCCESS(inSuite, opKeyStore.Init(&storage));

	Crypto::P256ECDSASignature sig;
	uint8_t message[] = { 'm', 's', 'g' };

	Crypto::P256Keypair * ephemeralKeypair = opKeyStore.AllocateEphemeralKeypairForCASE();
	NL_TEST_ASSERT(inSuite, ephemeralKeypair != nullptr);
	NL_TEST_ASSERT_SUCCESS(inSuite, ephemeralKeypair->Initialize());

	NL_TEST_ASSERT_SUCCESS(inSuite, ephemeralKeypair->ECDSA_sign_msg(message, sizeof(message), sig));
	NL_TEST_ASSERT_SUCCESS(inSuite, ephemeralKeypair->Pubkey().ECDSA_validate_msg_signature(message, sizeof(message), sig));

	opKeyStore.ReleaseEphemeralKeypair(ephemeralKeypair);

	opKeyStore.Finish();
	}

	/**
	* Test Suite. It lists all the test functions.
	*/
	static const nlTest sTests[] = { NL_TEST_DEF("Test Basic Lifecycle of PersistentStorageOperationalKeystore", TestBasicLifeCycle),
	NL_TEST_DEF("Test ephemeral key management", TestEphemeralKeys), NL_TEST_SENTINEL() };

	/**
	* Set up the test suite.
	*/
	int Test_Setup(void * inContext)
	{
	CHIP_ERROR error = chip::Platform::MemoryInit();
	VerifyOrReturnError(error == CHIP_NO_ERROR, FAILURE);
	return SUCCESS;
	}

	/**
	* Tear down the test suite.
	*/
	int Test_Teardown(void * inContext)
	{
	chip::Platform::MemoryShutdown();
	return SUCCESS;
	}

	} // namespace

	/**
	* Main
	*/
	int TestPersistentStorageOperationalKeystore()
	{
	nlTestSuite theSuite = { "PersistentStorageOperationalKeystore tests", &sTests[0], Test_Setup, Test_Teardown };

	// Run test suite againt one context.
	nlTestRunner(&theSuite, nullptr);
	return nlTestRunnerStats(&theSuite);
	}

	CHIP_REGISTER_TEST_SUITE(TestPersistentStorageOperationalKeystore)