Merge changes from topic "rkp-factory-tool" am: 0ab5ef3ff7 (a23de7b9) · Commits · e / os / android_hardware_interfaces

security/keymint/support/include/remote_prov/remote_prov_utils.h

+30 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,31 @@ using namespace cppcose;

	extern bytevec kTestMacKey;		extern bytevec kTestMacKey;

			// The Google root key for the Endpoint Encryption Key chain, encoded as COSE_Sign1
			inline constexpr uint8_t kCoseEncodedRootCert[] = {
			0x84, 0x43, 0xa1, 0x01, 0x27, 0xa0, 0x58, 0x2a, 0xa4, 0x01, 0x01, 0x03, 0x27, 0x20, 0x06,
			0x21, 0x58, 0x20, 0x99, 0xb9, 0xee, 0xdd, 0x5e, 0xe4, 0x52, 0xf6, 0x85, 0xc6, 0x4c, 0x62,
			0xdc, 0x3e, 0x61, 0xab, 0x57, 0x48, 0x7d, 0x75, 0x37, 0x29, 0xad, 0x76, 0x80, 0x32, 0xd2,
			0xb3, 0xcb, 0x63, 0x58, 0xd9, 0x58, 0x40, 0x1e, 0x22, 0x08, 0x4b, 0xa4, 0xb7, 0xa4, 0xc8,
			0xd7, 0x4e, 0x03, 0x0e, 0xfe, 0xb8, 0xaf, 0x14, 0x4c, 0xa7, 0x3b, 0x6f, 0xa5, 0xcd, 0xdc,
			0xda, 0x79, 0xc6, 0x2b, 0x64, 0xfe, 0x99, 0x39, 0xaf, 0x76, 0xe7, 0x80, 0xfa, 0x66, 0x00,
			0x85, 0x0d, 0x07, 0x98, 0x2a, 0xac, 0x91, 0x5c, 0xa7, 0x25, 0x14, 0x49, 0x06, 0x34, 0x75,
			0xca, 0x8a, 0x27, 0x7a, 0xd9, 0xe3, 0x5a, 0x49, 0xeb, 0x02, 0x03};

			// The Google Endpoint Encryption Key certificate, encoded as COSE_Sign1
			inline constexpr uint8_t kCoseEncodedGeekCert[] = {
			0x84, 0x43, 0xa1, 0x01, 0x27, 0xa0, 0x58, 0x4e, 0xa5, 0x01, 0x01, 0x02, 0x58, 0x20,
			0xd0, 0xae, 0xc1, 0x15, 0xca, 0x2a, 0xcf, 0x73, 0xae, 0x6b, 0xcc, 0xcb, 0xd1, 0x96,
			0x1d, 0x65, 0xe8, 0xb1, 0xdd, 0xd7, 0x4a, 0x1a, 0x37, 0xb9, 0x43, 0x3a, 0x97, 0xd5,
			0x99, 0xdf, 0x98, 0x08, 0x03, 0x38, 0x18, 0x20, 0x04, 0x21, 0x58, 0x20, 0xbe, 0x85,
			0xe7, 0x46, 0xc4, 0xa3, 0x42, 0x5a, 0x40, 0xd9, 0x36, 0x3a, 0xa6, 0x15, 0xd0, 0x2c,
			0x58, 0x7e, 0x3d, 0xdc, 0x33, 0x02, 0x32, 0xd2, 0xfc, 0x5e, 0x1e, 0x87, 0x25, 0x5f,
			0x72, 0x60, 0x58, 0x40, 0x9b, 0xcf, 0x90, 0xe2, 0x2e, 0x4b, 0xab, 0xd1, 0x18, 0xb1,
			0x0e, 0x8e, 0x5d, 0x20, 0x27, 0x4b, 0x84, 0x58, 0xfe, 0xfc, 0x32, 0x90, 0x7e, 0x72,
			0x05, 0x83, 0xbc, 0xd7, 0x82, 0xbe, 0xfa, 0x64, 0x78, 0x2d, 0x54, 0x10, 0x4b, 0xc0,
			0x31, 0xbf, 0x6b, 0xe8, 0x1e, 0x35, 0xe2, 0xf0, 0x2d, 0xce, 0x6c, 0x2f, 0x4f, 0xf2,
			0xf5, 0x4f, 0xa5, 0xd4, 0x83, 0xad, 0x96, 0xa2, 0xf1, 0x87, 0x58, 0x04};

	/**		/**
	* Generates random bytes.		* Generates random bytes.
	*/		*/
	@@ -44,6 +69,11 @@ struct EekChain {
	*/		*/
	ErrMsgOr<EekChain> generateEekChain(size_t length, const bytevec& eekId);		ErrMsgOr<EekChain> generateEekChain(size_t length, const bytevec& eekId);

			/**
			* Returns the CBOR-encoded, production Google Endpoint Encryption Key chain.
			*/
			bytevec getProdEekChain();

	struct BccEntryData {		struct BccEntryData {
	bytevec pubKey;		bytevec pubKey;
	};		};

security/keymint/support/remote_prov_utils.cpp

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,8 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

			#include <tuple>

	#include <remote_prov/remote_prov_utils.h>		#include <remote_prov/remote_prov_utils.h>

	#include <openssl/rand.h>		#include <openssl/rand.h>
	@@ -82,6 +84,18 @@ ErrMsgOr<EekChain> generateEekChain(size_t length, const bytevec& eekId) {
	return EekChain{eekChain.encode(), pub_key, priv_key};		return EekChain{eekChain.encode(), pub_key, priv_key};
	}		}

			bytevec getProdEekChain() {
			bytevec prodEek;
			prodEek.reserve(1 + sizeof(kCoseEncodedRootCert) + sizeof(kCoseEncodedGeekCert));

			// In CBOR encoding, 0x82 indicates an array of two items
			prodEek.push_back(0x82);
			prodEek.insert(prodEek.end(), std::begin(kCoseEncodedRootCert), std::end(kCoseEncodedRootCert));
			prodEek.insert(prodEek.end(), std::begin(kCoseEncodedGeekCert), std::end(kCoseEncodedGeekCert));

			return prodEek;
			}

	ErrMsgOr<bytevec> verifyAndParseCoseSign1Cwt(const cppbor::Array* coseSign1,		ErrMsgOr<bytevec> verifyAndParseCoseSign1Cwt(const cppbor::Array* coseSign1,
	const bytevec& signingCoseKey, const bytevec& aad) {		const bytevec& signingCoseKey, const bytevec& aad) {
	if (!coseSign1 \|\| coseSign1->size() != kCoseSign1EntryCount) {		if (!coseSign1 \|\| coseSign1->size() != kCoseSign1EntryCount) {

security/keymint/support/remote_prov_utils_test.cpp

+29 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,13 +14,16 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

			#include <cppbor_parse.h>
	#include <gmock/gmock.h>		#include <gmock/gmock.h>
	#include <gtest/gtest.h>		#include <gtest/gtest.h>
	#include <keymaster/android_keymaster_utils.h>		#include <keymaster/android_keymaster_utils.h>
			#include <keymaster/logger.h>
	#include <keymaster/remote_provisioning_utils.h>		#include <keymaster/remote_provisioning_utils.h>
	#include <openssl/curve25519.h>		#include <openssl/curve25519.h>
	#include <remote_prov/remote_prov_utils.h>		#include <remote_prov/remote_prov_utils.h>
	#include <cstdint>		#include <cstdint>
			#include "keymaster/cppcose/cppcose.h"

	namespace aidl::android::hardware::security::keymint::remote_prov {		namespace aidl::android::hardware::security::keymint::remote_prov {
	namespace {		namespace {
	@@ -51,5 +54,31 @@ TEST(RemoteProvUtilsTest, GenerateEekChain) {
	}		}
	}		}

			TEST(RemoteProvUtilsTest, GetProdEekChain) {
			auto chain = getProdEekChain();

			auto validation_result = validateAndExtractEekPubAndId(
			/testMode=/false, KeymasterBlob(chain.data(), chain.size()));
			ASSERT_TRUE(validation_result.isOk()) << "Error: " << validation_result.moveError();

			auto& [eekPub, eekId] = *validation_result;

			auto [geekCert, ignoredNewPos, error] =
			cppbor::parse(kCoseEncodedGeekCert, sizeof(kCoseEncodedGeekCert));
			ASSERT_NE(geekCert, nullptr) << "Error: " << error;
			ASSERT_NE(geekCert->asArray(), nullptr);

			auto& encodedGeekCoseKey = geekCert->asArray()->get(kCoseSign1Payload);
			ASSERT_NE(encodedGeekCoseKey, nullptr);
			ASSERT_NE(encodedGeekCoseKey->asBstr(), nullptr);

			auto geek = CoseKey::parse(encodedGeekCoseKey->asBstr()->value());
			ASSERT_TRUE(geek) << "Error: " << geek.message();

			const std::vector<uint8_t> empty;
			EXPECT_THAT(eekId, ElementsAreArray(geek->getBstrValue(CoseKey::KEY_ID).value_or(empty)));
			EXPECT_THAT(eekPub, ElementsAreArray(geek->getBstrValue(CoseKey::PUBKEY_X).value_or(empty)));
			}

	} // namespace		} // namespace
	} // namespace aidl::android::hardware::security::keymint::remote_prov		} // namespace aidl::android::hardware::security::keymint::remote_prov