Skip to content

Commit d7f7ea6

Browse files
fix: drop TrustAnchors, add AppraisalPolicy
TrustAnchors is a remnant from a previous point in time and is not supported in the latest draft-ietf-rats-msg-wrap which defines AppraisalPolicy instead. Signed-off-by: Thomas Fossati <[email protected]>
1 parent 23a5428 commit d7f7ea6

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

indicator.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ const (
1616
Endorsements
1717
Evidence
1818
AttestationResults
19-
TrustAnchors
19+
AppraisalPolicy
2020
)
21-
const MaxIndicatorValue = (TrustAnchors << 1) - 1
21+
const MaxIndicatorValue = (AppraisalPolicy << 1) - 1
2222

2323
const IndicatorNone = 0
2424

@@ -27,6 +27,7 @@ var indMap = map[Indicator]string{
2727
Endorsements: "endorsements",
2828
Evidence: "evidence",
2929
AttestationResults: "attestation results",
30+
AppraisalPolicy: "appraisal policy",
3031
}
3132

3233
func (o *Indicator) Set(v Indicator) { *o |= v }

indicator_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ func Test_Indicator_misc(t *testing.T) {
1717
assert.False(t, i.Has(ReferenceValues))
1818
assert.False(t, i.Has(Endorsements))
1919
assert.False(t, i.Has(Evidence))
20-
assert.False(t, i.Has(TrustAnchors))
20+
assert.False(t, i.Has(AppraisalPolicy))
2121

2222
i.Set(AttestationResults)
2323
assert.True(t, i.Has(AttestationResults))
2424
assert.False(t, i.Has(ReferenceValues))
2525
assert.False(t, i.Has(Endorsements))
2626
assert.False(t, i.Has(Evidence))
27-
assert.False(t, i.Has(TrustAnchors))
27+
assert.False(t, i.Has(AppraisalPolicy))
2828

2929
i.Clear(AttestationResults)
3030
assert.True(t, i.Empty())
@@ -38,10 +38,10 @@ func Test_Indicator_misc(t *testing.T) {
3838
i.Set(ReferenceValues)
3939
i.Set(Evidence)
4040
i.Set(Endorsements)
41-
i.Set(TrustAnchors)
41+
i.Set(AppraisalPolicy)
4242
assert.True(t, i.Has(AttestationResults))
4343
assert.True(t, i.Has(ReferenceValues))
4444
assert.True(t, i.Has(Endorsements))
4545
assert.True(t, i.Has(Evidence))
46-
assert.True(t, i.Has(TrustAnchors))
46+
assert.True(t, i.Has(AppraisalPolicy))
4747
}

monad_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func Test_MarshalJSON_record_ok(t *testing.T) {
112112
args{
113113
"application/corim+signed",
114114
[]byte{0xde, 0xad, 0xbe, 0xef},
115-
[]Indicator{ReferenceValues, Endorsements, TrustAnchors},
115+
[]Indicator{ReferenceValues, Endorsements, AppraisalPolicy},
116116
},
117117
`[ "application/corim+signed", "3q2-7w", 19 ]`,
118118
},
@@ -165,7 +165,7 @@ func Test_MarshalCBOR_record_ok(t *testing.T) {
165165
args{
166166
10000,
167167
[]byte{0xde, 0xad, 0xbe, 0xef},
168-
[]Indicator{ReferenceValues, Endorsements, TrustAnchors},
168+
[]Indicator{ReferenceValues, Endorsements, AppraisalPolicy},
169169
},
170170
[]byte{0x83, 0x19, 0x27, 0x10, 0x44, 0xde, 0xad, 0xbe, 0xef, 0x13},
171171
},
@@ -492,7 +492,7 @@ func Test_Validate_monad_ok(t *testing.T) {
492492
"with multiple indicators",
493493
"application/corim+signed",
494494
[]byte{0xde, 0xad, 0xbe, 0xef},
495-
[]Indicator{ReferenceValues, Endorsements, TrustAnchors},
495+
[]Indicator{ReferenceValues, Endorsements, AppraisalPolicy},
496496
},
497497
{
498498
"with maximum valid indicator value (31)",

0 commit comments

Comments
 (0)