Skip to content

Do not decrypt Contents and ByteRange in a Sig dictionary #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dev-gto wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not decrypt Contents and ByteRange in a Sig dictionary #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions lex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ type buffer struct {
allowEOF bool
allowObjptr bool
allowStream bool
decDisabled bool
eof bool
key []byte
useAES bool
Expand Down Expand Up @@ -567,11 +568,14 @@ func (b *buffer) readObject() Object {
}

if tok.Kind == String && b.key != nil && b.objptr.id != 0 {
var err error
str := tok.StringVal
decrypted, err := decryptString(b.key, b.useAES, b.encVersion, b.objptr, str)
if err != nil {
panic(err)
if !b.decDisabled {
str := tok.StringVal
decrypted, err := decryptString(b.key, b.useAES, b.encVersion, b.objptr, str)
if err != nil {
panic(err)
}
} else {
decrypted = tok.StringVal
}
return Object{Kind: String, StringVal: decrypted}
}
Expand Down Expand Up @@ -763,6 +767,7 @@ func (b *buffer) readArray() Object {

func (b *buffer) readDict() Object {
x := make(map[string]Object)
decDisabled := false
for {
tok := b.readToken()
if tok.Kind == Keyword && tok.KeywordVal == ">>" {
Expand All @@ -777,7 +782,18 @@ func (b *buffer) readDict() Object {
continue
}
n := tok.NameVal

if decDisabled && (n == "Contents" || n == "ByteRange") {
b.decDisabled = true
}

x[n] = b.readObject()

b.decDisabled = false

if n == "Type" && x[n] == "Sig" {
decDisabled = true
}
}

if !b.allowStream {
Expand Down