OrgGo/unipdf
1
0
Fork 0
mirror of https://github.com/unidoc/unipdf.git synced 2025-05-05 19:30:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better handling of Contents of Signature dictionary

Browse Source
This commit is contained in:
Gunnsteinn Hall 2016-09-28 15:04:11 +00:00
parent 0238457a11
commit f597d41d4c
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pdf/crypt.go
View File

@ -552,7 +552,7 @@ func (this *PdfCrypt) Decrypt(obj PdfObject, parentObjNum, parentGenNum int64) e
streamFilter = this.streamFilter streamFilter = this.streamFilter
common.Log.Debug("this.streamFilter = %s", this.streamFilter) common.Log.Debug("this.streamFilter = %s", this.streamFilter)
if filters, ok := (*dict)["Filters"].(*PdfObjectArray); ok { if filters, ok := (*dict)["Filter"].(*PdfObjectArray); ok {
// Crypt filter can only be the first entry. // Crypt filter can only be the first entry.
if firstFilter, ok := (*filters)[0].(*PdfObjectName); ok { if firstFilter, ok := (*filters)[0].(*PdfObjectName); ok {
if *firstFilter == "Crypt" { if *firstFilter == "Crypt" {
@ -645,9 +645,21 @@ func (this *PdfCrypt) Decrypt(obj PdfObject, parentObjNum, parentGenNum int64) e
} }
if d, isDict := obj.(*PdfObjectDictionary); isDict { if d, isDict := obj.(*PdfObjectDictionary); isDict {
isSig := false
if t, hasType := (*d)["Type"]; hasType {
typeStr, ok := t.(*PdfObjectName)
if ok && *typeStr == "Sig" {
isSig = true
}
}
for keyidx, o := range *d { for keyidx, o := range *d {
// How can we avoid this check, i.e. implement a more smart // How can we avoid this check, i.e. implement a more smart
// traversal system? // traversal system?
if isSig && string(keyidx) == "Contents" {
// Leave the Contents of a Signature dictionary.
continue
}
if string(keyidx) != "Parent" && string(keyidx) != "Prev" && string(keyidx) != "Last" { // Check not needed? if string(keyidx) != "Parent" && string(keyidx) != "Prev" && string(keyidx) != "Last" { // Check not needed?
err := this.Decrypt(o, parentObjNum, parentGenNum) err := this.Decrypt(o, parentObjNum, parentGenNum)
if err != nil { if err != nil {
@ -788,7 +800,7 @@ func (this *PdfCrypt) Encrypt(obj PdfObject, parentObjNum, parentGenNum int64) e
streamFilter = this.streamFilter streamFilter = this.streamFilter
common.Log.Debug("this.streamFilter = %s", this.streamFilter) common.Log.Debug("this.streamFilter = %s", this.streamFilter)
if filters, ok := (*dict)["Filters"].(*PdfObjectArray); ok { if filters, ok := (*dict)["Filter"].(*PdfObjectArray); ok {
// Crypt filter can only be the first entry. // Crypt filter can only be the first entry.
if firstFilter, ok := (*filters)[0].(*PdfObjectName); ok { if firstFilter, ok := (*filters)[0].(*PdfObjectName); ok {
if *firstFilter == "Crypt" { if *firstFilter == "Crypt" {
@ -879,9 +891,21 @@ func (this *PdfCrypt) Encrypt(obj PdfObject, parentObjNum, parentGenNum int64) e
} }
if d, isDict := obj.(*PdfObjectDictionary); isDict { if d, isDict := obj.(*PdfObjectDictionary); isDict {
isSig := false
if t, hasType := (*d)["Type"]; hasType {
typeStr, ok := t.(*PdfObjectName)
if ok && *typeStr == "Sig" {
isSig = true
}
}
for keyidx, o := range *d { for keyidx, o := range *d {
// How can we avoid this check, i.e. implement a more smart // How can we avoid this check, i.e. implement a more smart
// traversal system? // traversal system?
if isSig && string(keyidx) == "Contents" {
// Leave the Contents of a Signature dictionary.
continue
}
if string(keyidx) != "Parent" && string(keyidx) != "Prev" && string(keyidx) != "Last" { // Check not needed? if string(keyidx) != "Parent" && string(keyidx) != "Prev" && string(keyidx) != "Last" { // Check not needed?
err := this.Encrypt(o, parentObjNum, parentGenNum) err := this.Encrypt(o, parentObjNum, parentGenNum)
if err != nil { if err != nil {