Merge "KeyMint VTS: don't combine ATTEST_KEY with SIGN" into sc-v2-dev (46d62b92) · Commits · e / os / android_hardware_interfaces

security/keymint/aidl/vts/functional/AttestKeyTest.cpp

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ TEST_P(AttestKeyTest, AllRsaSizes) {
	vector<KeyCharacteristics> attest_key_characteristics;		vector<KeyCharacteristics> attest_key_characteristics;
	vector<Certificate> attest_key_cert_chain;		vector<Certificate> attest_key_cert_chain;
	ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()		ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
	.RsaSigningKey(size, 65537)		.RsaKey(size, 65537)
	.AttestKey()		.AttestKey()
	.SetDefaultValidity(),		.SetDefaultValidity(),
	{} /* attestation signing key */, &attest_key.keyBlob,		{} /* attestation signing key */, &attest_key.keyBlob,
	@@ -200,7 +200,7 @@ TEST_P(AttestKeyTest, RsaAttestedAttestKeys) {
	vector<Certificate> attest_key_cert_chain;		vector<Certificate> attest_key_cert_chain;
	ASSERT_EQ(ErrorCode::OK,		ASSERT_EQ(ErrorCode::OK,
	GenerateKey(AuthorizationSetBuilder()		GenerateKey(AuthorizationSetBuilder()
	.RsaSigningKey(2048, 65537)		.RsaKey(2048, 65537)
	.AttestKey()		.AttestKey()
	.AttestationChallenge(challenge)		.AttestationChallenge(challenge)
	.AttestationApplicationId(app_id)		.AttestationApplicationId(app_id)
	@@ -299,7 +299,7 @@ TEST_P(AttestKeyTest, RsaAttestKeyChaining) {

	EXPECT_EQ(ErrorCode::OK,		EXPECT_EQ(ErrorCode::OK,
	GenerateKey(AuthorizationSetBuilder()		GenerateKey(AuthorizationSetBuilder()
	.RsaSigningKey(2048, 65537)		.RsaKey(2048, 65537)
	.AttestKey()		.AttestKey()
	.AttestationChallenge("foo")		.AttestationChallenge("foo")
	.AttestationApplicationId("bar")		.AttestationApplicationId("bar")
	@@ -371,7 +371,7 @@ TEST_P(AttestKeyTest, EcAttestKeyChaining) {

	EXPECT_EQ(ErrorCode::OK,		EXPECT_EQ(ErrorCode::OK,
	GenerateKey(AuthorizationSetBuilder()		GenerateKey(AuthorizationSetBuilder()
	.EcdsaSigningKey(EcCurve::P_256)		.EcdsaKey(EcCurve::P_256)
	.AttestKey()		.AttestKey()
	.AttestationChallenge("foo")		.AttestationChallenge("foo")
	.AttestationApplicationId("bar")		.AttestationApplicationId("bar")
	@@ -446,7 +446,7 @@ TEST_P(AttestKeyTest, AlternateAttestKeyChaining) {
	if ((i & 0x1) == 1) {		if ((i & 0x1) == 1) {
	EXPECT_EQ(ErrorCode::OK,		EXPECT_EQ(ErrorCode::OK,
	GenerateKey(AuthorizationSetBuilder()		GenerateKey(AuthorizationSetBuilder()
	.EcdsaSigningKey(EcCurve::P_256)		.EcdsaKey(EcCurve::P_256)
	.AttestKey()		.AttestKey()
	.AttestationChallenge("foo")		.AttestationChallenge("foo")
	.AttestationApplicationId("bar")		.AttestationApplicationId("bar")
	@@ -459,7 +459,7 @@ TEST_P(AttestKeyTest, AlternateAttestKeyChaining) {
	} else {		} else {
	EXPECT_EQ(ErrorCode::OK,		EXPECT_EQ(ErrorCode::OK,
	GenerateKey(AuthorizationSetBuilder()		GenerateKey(AuthorizationSetBuilder()
	.RsaSigningKey(2048, 65537)		.RsaKey(2048, 65537)
	.AttestKey()		.AttestKey()
	.AttestationChallenge("foo")		.AttestationChallenge("foo")
	.AttestationApplicationId("bar")		.AttestationApplicationId("bar")
	@@ -509,7 +509,7 @@ TEST_P(AttestKeyTest, MissingChallenge) {
	vector<KeyCharacteristics> attest_key_characteristics;		vector<KeyCharacteristics> attest_key_characteristics;
	vector<Certificate> attest_key_cert_chain;		vector<Certificate> attest_key_cert_chain;
	ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()		ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
	.RsaSigningKey(size, 65537)		.RsaKey(size, 65537)
	.AttestKey()		.AttestKey()
	.SetDefaultValidity(),		.SetDefaultValidity(),
	{} /* attestation signing key */, &attest_key.keyBlob,		{} /* attestation signing key */, &attest_key.keyBlob,
	@@ -555,10 +555,10 @@ TEST_P(AttestKeyTest, AllEcCurves) {
	AttestationKey attest_key;		AttestationKey attest_key;
	vector<KeyCharacteristics> attest_key_characteristics;		vector<KeyCharacteristics> attest_key_characteristics;
	vector<Certificate> attest_key_cert_chain;		vector<Certificate> attest_key_cert_chain;
	ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()		ASSERT_EQ(
	.EcdsaSigningKey(curve)		ErrorCode::OK,
	.AttestKey()		GenerateKey(
	.SetDefaultValidity(),		AuthorizationSetBuilder().EcdsaKey(curve).AttestKey().SetDefaultValidity(),
	{} /* attestation signing key */, &attest_key.keyBlob,		{} /* attestation signing key */, &attest_key.keyBlob,
	&attest_key_characteristics, &attest_key_cert_chain));		&attest_key_characteristics, &attest_key_cert_chain));

	@@ -671,7 +671,7 @@ TEST_P(AttestKeyTest, EcdsaAttestationID) {
	vector<KeyCharacteristics> attest_key_characteristics;		vector<KeyCharacteristics> attest_key_characteristics;
	vector<Certificate> attest_key_cert_chain;		vector<Certificate> attest_key_cert_chain;
	ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()		ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
	.EcdsaSigningKey(EcCurve::P_256)		.EcdsaKey(EcCurve::P_256)
	.AttestKey()		.AttestKey()
	.SetDefaultValidity(),		.SetDefaultValidity(),
	{} /* attestation signing key */, &attest_key.keyBlob,		{} /* attestation signing key */, &attest_key.keyBlob,
	@@ -735,7 +735,7 @@ TEST_P(AttestKeyTest, EcdsaAttestationMismatchID) {
	vector<KeyCharacteristics> attest_key_characteristics;		vector<KeyCharacteristics> attest_key_characteristics;
	vector<Certificate> attest_key_cert_chain;		vector<Certificate> attest_key_cert_chain;
	ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()		ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
	.EcdsaSigningKey(EcCurve::P_256)		.EcdsaKey(EcCurve::P_256)
	.AttestKey()		.AttestKey()
	.SetDefaultValidity(),		.SetDefaultValidity(),
	{} /* attestation signing key */, &attest_key.keyBlob,		{} /* attestation signing key */, &attest_key.keyBlob,