Commit 2701bb2b authored by renovate's avatar renovate
Browse files

Update module github.com/ProtonMail/gopenpgp/v2 to v2.4.6

parent 74f2a835
Pipeline #30597 failed with stages
in 2 minutes and 17 seconds
...@@ -8,7 +8,7 @@ require ( ...@@ -8,7 +8,7 @@ require (
git.autistici.org/id/auth v0.0.0-20211206094959-05544c3c95bb git.autistici.org/id/auth v0.0.0-20211206094959-05544c3c95bb
git.autistici.org/id/go-sso v0.0.0-20210117165919-e56e6579953d git.autistici.org/id/go-sso v0.0.0-20210117165919-e56e6579953d
git.autistici.org/id/usermetadb v0.0.0-20210507085300-ad16aa223703 git.autistici.org/id/usermetadb v0.0.0-20210507085300-ad16aa223703
github.com/ProtonMail/gopenpgp/v2 v2.4.5 github.com/ProtonMail/gopenpgp/v2 v2.4.6
github.com/go-ldap/ldap/v3 v3.4.2 github.com/go-ldap/ldap/v3 v3.4.2
github.com/go-test/deep v1.0.7 github.com/go-test/deep v1.0.7
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
......
...@@ -70,8 +70,12 @@ github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f h1:J2FzIrXN82 ...@@ -70,8 +70,12 @@ github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f h1:J2FzIrXN82
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a h1:W6RrgN/sTxg1msqzFFb+G80MFmpjMw61IU+slm+wln4= github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a h1:W6RrgN/sTxg1msqzFFb+G80MFmpjMw61IU+slm+wln4=
github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4= github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4=
github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f h1:CGq7OieOz3wyQJ1fO8S0eO9TCW1JyvLrf8fhzz1i8ko=
github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4=
github.com/ProtonMail/gopenpgp/v2 v2.4.5 h1:G7fOIAEcdwRUreFBUNVrZqiJPZQe6nn6V/5aNr6ZfYw= github.com/ProtonMail/gopenpgp/v2 v2.4.5 h1:G7fOIAEcdwRUreFBUNVrZqiJPZQe6nn6V/5aNr6ZfYw=
github.com/ProtonMail/gopenpgp/v2 v2.4.5/go.mod h1:0byYFEOo6x4F/1YqhN7Z6m015Cqnxllz3CGb5cjJueY= github.com/ProtonMail/gopenpgp/v2 v2.4.5/go.mod h1:0byYFEOo6x4F/1YqhN7Z6m015Cqnxllz3CGb5cjJueY=
github.com/ProtonMail/gopenpgp/v2 v2.4.6 h1:/EcJsFIsE0ywShAJ+lNLafcaSd6GBhIzHsaBID5pGXw=
github.com/ProtonMail/gopenpgp/v2 v2.4.6/go.mod h1:ZW1KxHNG6q5LMgFKf9Ap/d2eVYeyGf5+fAUEAjJWtmo=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
......
...@@ -377,7 +377,7 @@ func (ptc *PlainTextCollector) Accept(partReader io.Reader, header textproto.MIM ...@@ -377,7 +377,7 @@ func (ptc *PlainTextCollector) Accept(partReader io.Reader, header textproto.MIM
buffer, err = DecodeCharset(buffer, mediaType, params) buffer, err = DecodeCharset(buffer, mediaType, params)
if err != nil { if err != nil {
log.Warnln("Decode charset error:", err) log.Warnln("Decode charset error:", err)
return err err = nil // Don't fail parsing on decoding errors, use original
} }
ptc.plainTextContents.Write(buffer) ptc.plainTextContents.Write(buffer)
} }
...@@ -432,7 +432,7 @@ func (bc *BodyCollector) Accept(partReader io.Reader, header textproto.MIMEHeade ...@@ -432,7 +432,7 @@ func (bc *BodyCollector) Accept(partReader io.Reader, header textproto.MIMEHeade
buffer, err = DecodeCharset(buffer, mediaType, params) buffer, err = DecodeCharset(buffer, mediaType, params)
if err != nil { if err != nil {
log.Warnln("Decode charset error:", err) log.Warnln("Decode charset error:", err)
return err err = nil // Don't fail parsing on decoding errors, use original
} }
if mediaType == "text/html" { if mediaType == "text/html" {
bc.hasHtml = true bc.hasHtml = true
...@@ -501,7 +501,7 @@ func (ac *AttachmentsCollector) Accept(partReader io.Reader, header textproto.MI ...@@ -501,7 +501,7 @@ func (ac *AttachmentsCollector) Accept(partReader io.Reader, header textproto.MI
buffer, err = DecodeCharset(buffer, mediaType, params) buffer, err = DecodeCharset(buffer, mediaType, params)
if err != nil { if err != nil {
log.Warnln("Decode charset error:", err) log.Warnln("Decode charset error:", err)
return err err = nil // Don't fail parsing on decoding errors, use original
} }
headerBuf := new(bytes.Buffer) headerBuf := new(bytes.Buffer)
http.Header(header).Write(headerBuf) http.Header(header).Write(headerBuf)
......
...@@ -3,7 +3,7 @@ package constants ...@@ -3,7 +3,7 @@ package constants
// Constants for armored data. // Constants for armored data.
const ( const (
ArmorHeaderVersion = "GopenPGP 2.4.5" ArmorHeaderVersion = "GopenPGP 2.4.6"
ArmorHeaderComment = "https://gopenpgp.org" ArmorHeaderComment = "https://gopenpgp.org"
PGPMessageHeader = "PGP MESSAGE" PGPMessageHeader = "PGP MESSAGE"
PGPSignatureHeader = "PGP SIGNATURE" PGPSignatureHeader = "PGP SIGNATURE"
......
package constants package constants
const Version = "2.4.5" const Version = "2.4.6"
...@@ -8,6 +8,7 @@ import ( ...@@ -8,6 +8,7 @@ import (
"net/textproto" "net/textproto"
pgpErrors "github.com/ProtonMail/go-crypto/openpgp/errors" pgpErrors "github.com/ProtonMail/go-crypto/openpgp/errors"
"github.com/ProtonMail/gopenpgp/v2/internal"
"github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/ProtonMail/go-crypto/openpgp/packet"
...@@ -98,7 +99,8 @@ func (sc *SignatureCollector) Accept( ...@@ -98,7 +99,8 @@ func (sc *SignatureCollector) Accept(
} }
sc.signature = string(buffer) sc.signature = string(buffer)
str, _ := ioutil.ReadAll(rawBody) str, _ := ioutil.ReadAll(rawBody)
rawBody = bytes.NewReader(str) canonicalizedBody := internal.CanonicalizeAndTrim(string(str))
rawBody = bytes.NewReader([]byte(canonicalizedBody))
if sc.keyring != nil { if sc.keyring != nil {
_, err = openpgp.CheckArmoredDetachedSignature(sc.keyring, rawBody, bytes.NewReader(buffer), sc.config) _, err = openpgp.CheckArmoredDetachedSignature(sc.keyring, rawBody, bytes.NewReader(buffer), sc.config)
......
...@@ -52,9 +52,9 @@ github.com/ProtonMail/go-crypto/openpgp/internal/ecc ...@@ -52,9 +52,9 @@ github.com/ProtonMail/go-crypto/openpgp/internal/ecc
github.com/ProtonMail/go-crypto/openpgp/internal/encoding github.com/ProtonMail/go-crypto/openpgp/internal/encoding
github.com/ProtonMail/go-crypto/openpgp/packet github.com/ProtonMail/go-crypto/openpgp/packet
github.com/ProtonMail/go-crypto/openpgp/s2k github.com/ProtonMail/go-crypto/openpgp/s2k
# github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a # github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f
github.com/ProtonMail/go-mime github.com/ProtonMail/go-mime
# github.com/ProtonMail/gopenpgp/v2 v2.4.5 # github.com/ProtonMail/gopenpgp/v2 v2.4.6
## explicit ## explicit
github.com/ProtonMail/gopenpgp/v2/armor github.com/ProtonMail/gopenpgp/v2/armor
github.com/ProtonMail/gopenpgp/v2/constants github.com/ProtonMail/gopenpgp/v2/constants
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment