Jomaar/go-dkim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bugfix empty line & relaxed

Browse Source
This commit is contained in:
Stéphane Depierrepont aka Toorop
2015-05-22 09:11:03 +02:00
parent c1082daa5c
commit 12fc3f3272
2 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dkim.go
View File

@@ -238,11 +238,13 @@ func Verify(email *[]byte) (verifyOutput, error) {
}
//println("|" + string(body) + "|")
// get body hash
bodyHash, err := getBodyHash(&body, sigHash[1], dkimHeader.BodyLength)
if err != nil {
return getVerifyOutput(PERMFAIL, err, pubKey.FlagTesting)
}
//println(bodyHash)
if bodyHash != dkimHeader.BodyHash {
return getVerifyOutput(PERMFAIL, ErrVerifyBodyHash, pubKey.FlagTesting)
}
@@ -350,12 +352,12 @@ func canonicalize(email *[]byte, cano string, h []string) (headers, body []byte,
rawBody = rxReduceWS.ReplaceAll(rawBody, []byte(" "))
for _, line := range bytes.SplitAfter(rawBody, []byte{10}) {
line = bytes.TrimRight(line, " \r\n")
if len(line) != 0 {
body = append(body, line...)
body = append(body, []byte{13, 10}...)
}
body = append(body, line...)
body = append(body, []byte{13, 10}...)
}
body = bytes.TrimRight(body, "\r\n")
body = append(body, []byte{13, 10}...)
}
return
}