From 29016b1e370aaa89a21de345b6cc6d361e748028 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Thu, 10 Dec 2020 12:13:55 +0100
Subject: [PATCH] Upgrade to go-milter 0.3.1

This fixes some dkim-milter issues with Postfix.
---
 cmd/dkim-milter/main.go | 18 ++----------------
 go.mod                  |  6 +++---
 go.sum                  | 15 +++++++++------
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/cmd/dkim-milter/main.go b/cmd/dkim-milter/main.go
index 9b7a0ea..16332bc 100644
--- a/cmd/dkim-milter/main.go
+++ b/cmd/dkim-milter/main.go
@@ -81,6 +81,8 @@ func (f *stringSliceFlag) Set(value string) error {
 }
 
 type session struct {
+	milter.NoOpMilter
+
 	authResDelete []int
 	headerBuf     bytes.Buffer
 
@@ -94,22 +96,6 @@ type session struct {
 	mw     io.Writer
 }
 
-func (s *session) Connect(host string, family string, port uint16, addr net.IP, m *milter.Modifier) (milter.Response, error) {
-	return nil, nil
-}
-
-func (s *session) Helo(name string, m *milter.Modifier) (milter.Response, error) {
-	return nil, nil
-}
-
-func (s *session) MailFrom(from string, m *milter.Modifier) (milter.Response, error) {
-	return nil, nil
-}
-
-func (s *session) RcptTo(rcptTo string, m *milter.Modifier) (milter.Response, error) {
-	return nil, nil
-}
-
 func parseAddressDomain(s string) (string, error) {
 	addr, err := mail.ParseAddress(s)
 	if err != nil {
diff --git a/go.mod b/go.mod
index 3e790d7..cd06539 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/emersion/go-msgauth
 go 1.12
 
 require (
-	github.com/emersion/go-message v0.13.0 // indirect
-	github.com/emersion/go-milter v0.3.0
-	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
+	github.com/emersion/go-message v0.14.0 // indirect
+	github.com/emersion/go-milter v0.3.1
+	golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9
 )
diff --git a/go.sum b/go.sum
index a1adf28..bfa263c 100644
--- a/go.sum
+++ b/go.sum
@@ -2,22 +2,25 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/emersion/go-message v0.11.2 h1:oxO9SQ+3wgBAQRdk07eqfkCJ26Tl8ZHF7CcpGVoE00o=
 github.com/emersion/go-message v0.11.2/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY=
-github.com/emersion/go-message v0.13.0 h1:R4+CZv4Msxfk9tMaERjMkapdvdO2faWLuB5KHFsNLZE=
-github.com/emersion/go-message v0.13.0/go.mod h1:kYIioST9GDHte9/BRWgi93rpqbDuFftMjKSMaXS8ABo=
-github.com/emersion/go-milter v0.3.0 h1:A1C13tTpbSXjwUtEHlBc5cRyumdPJif46q22lHKS0Og=
-github.com/emersion/go-milter v0.3.0/go.mod h1:ablHK0pbLB83kMFBznp/Rj8aV+Kc3jw8cxzzmCNLIOY=
+github.com/emersion/go-message v0.14.0 h1:RMEs13hsCJ6I+bsjwD/pq38+bYEj8nMqb/0LUw/PEG8=
+github.com/emersion/go-message v0.14.0/go.mod h1:N1JWdZQ2WRUalmdHAX308CWBq747VJ8oUorFI3VCBwU=
+github.com/emersion/go-milter v0.3.1 h1:f9bbLnYnAse3phnKvV2O2yknrkKGbDM5GHdDEN/CIRs=
+github.com/emersion/go-milter v0.3.1/go.mod h1:ablHK0pbLB83kMFBznp/Rj8aV+Kc3jw8cxzzmCNLIOY=
 github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
 github.com/martinlindhe/base36 v1.0.0/go.mod h1:+AtEs8xrBpCeYgSLoY/aJ6Wf37jtBuR0s35750M27+8=
+github.com/martinlindhe/base36 v1.1.0/go.mod h1:+AtEs8xrBpCeYgSLoY/aJ6Wf37jtBuR0s35750M27+8=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o=
-golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 h1:sYNJzB4J8toYPQTM6pAkcmBRgw9SnQKP9oXCHfgy604=
+golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=