Generate a valid Keyset in DeriveKeyset

PiperOrigin-RevId: 649183402
Change-Id: Ie150276669cd85e2a09122bfc6011aeb106e2ef4

keyderivation/prf_based_deriver.go

@@ -83,18 +83,20 @@ func (p *prfBasedDeriver) DeriveKeyset(salt []byte) (*keyset.Handle, error) {
 		return nil, fmt.Errorf("derive key failed: %v", err)
 	}
 	// Fill in placeholder values for key ID, status, and output prefix type.
+	// The placeholder values are s.t. the keyset is valid and can be used to
+	// create a keyset handle.
 	// These will be populated with the correct values in the keyset deriver
-	// factory. This is acceptable because the keyset as-is will never leave Tink,
-	// and the user only interacts via the keyset deriver factory.
+	// factory. This is acceptable because the keyset as-is will never leave
+	// Tink, and the user only interacts via the keyset deriver factory.
 	var primaryKeyID uint32 = 0
 	return keysetHandle(&tinkpb.Keyset{
 		PrimaryKeyId: primaryKeyID,
 		Key: []*tinkpb.Keyset_Key{
 			&tinkpb.Keyset_Key{
 				KeyData:          keyData,
-				Status:           tinkpb.KeyStatusType_UNKNOWN_STATUS,
+				Status:           tinkpb.KeyStatusType_ENABLED,
 				KeyId:            primaryKeyID,
-				OutputPrefixType: tinkpb.OutputPrefixType_UNKNOWN_PREFIX,
+				OutputPrefixType: tinkpb.OutputPrefixType_RAW,
 			},
 		},
 	})

keyderivation/prf_based_deriver_test.go

@@ -241,10 +241,10 @@ func TestPRFBasedDeriverWithHKDFRFCVectorForAESGCM(t *testing.T) {
 				t.Fatal("keyset has no primary key")
 			}
 			// Verify key attributes set by prfBasedDeriver.
-			if got, want := key.GetStatus(), tinkpb.KeyStatusType_UNKNOWN_STATUS; got != want {
+			if got, want := key.GetStatus(), tinkpb.KeyStatusType_ENABLED; got != want {
 				t.Errorf("derived key status = %s, want %s", got, want)
 			}
-			if got, want := key.GetOutputPrefixType(), tinkpb.OutputPrefixType_UNKNOWN_PREFIX; got != want {
+			if got, want := key.GetOutputPrefixType(), tinkpb.OutputPrefixType_RAW; got != want {
 				t.Errorf("derived key output prefix type = %s, want %s", got, want)
 			}
 			// Verify key value.