Skip to content

Commit d26a937

Browse files
committed
kill unmarshalIgnoreExpired.
1 parent 535e9ed commit d26a937

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

verify/verify.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -129,23 +129,6 @@ func (db *DB) Unmarshal(b []byte, v interface{}, role string, minVersion int) er
129129
return json.Unmarshal(s.Signed, v)
130130
}
131131

132-
// UnmarshalExpired is exactly like Unmarshal except ignores expired timestamp error.
133-
func (db *DB) UnmarshalIgnoreExpired(b []byte, v interface{}, role string, minVersion int) error {
134-
s := &data.Signed{}
135-
if err := json.Unmarshal(b, s); err != nil {
136-
return err
137-
}
138-
// Note: If verification fails, then we wont attempt to unmarshal
139-
// unless when verification error is errExpired.
140-
verifyErr := db.Verify(s, role, minVersion)
141-
if verifyErr != nil {
142-
if _, ok := verifyErr.(ErrExpired); !ok {
143-
return verifyErr
144-
}
145-
}
146-
return json.Unmarshal(s.Signed, v)
147-
}
148-
149132
func (db *DB) UnmarshalTrusted(b []byte, v interface{}, role string) error {
150133
s := &data.Signed{}
151134
if err := json.Unmarshal(b, s); err != nil {

0 commit comments

Comments
 (0)