Skip to content

Commit

Permalink
fix(signatureWriter): Keep flag state in canonical write
Browse files Browse the repository at this point in the history
  • Loading branch information
lubux committed Jul 19, 2023
1 parent e752bf4 commit e5a0a41
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions openpgp/write.go
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ func writeAndSign(payload io.WriteCloser, candidateHashes [][]uint8, signEntitie
if hints.IsUTF8 {
metadata.Format = 'u'
}
return signatureWriter{payload, literalData, signers, sigType, config, metadata, intendedRecipients}, nil
return signatureWriter{payload, literalData, signers, sigType, config, metadata, intendedRecipients, 0}, nil
}
return literalData, nil
}
Expand Down Expand Up @@ -725,6 +725,7 @@ type signatureWriter struct {
config *packet.Config
metadata *packet.LiteralData // V5 signatures protect document metadata
intendedRecipients []*packet.Recipient
flag int
}

type signatureContext struct {
Expand All @@ -745,8 +746,7 @@ func (s signatureWriter) Write(data []byte) (int, error) {
case packet.SigTypeBinary:
return s.literalData.Write(data)
case packet.SigTypeText:
flag := 0
return writeCanonical(s.literalData, data, &flag)
return writeCanonical(s.literalData, data, &s.flag)
}
return 0, errors.UnsupportedError("unsupported signature type: " + strconv.Itoa(int(s.sigType)))
}
Expand Down

0 comments on commit e5a0a41

Please sign in to comment.