Commit 7d975237 authored by ale's avatar ale
Browse files

Merge branch 'renovate/github.com-protonmail-gopenpgp-v2-2.x' into 'master'

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

See merge request !51
parents 2008d2a2 ed3652b8
Pipeline #31591 passed with stages
in 3 minutes and 25 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.6 github.com/ProtonMail/gopenpgp/v2 v2.4.7
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
......
...@@ -76,6 +76,8 @@ github.com/ProtonMail/gopenpgp/v2 v2.4.5 h1:G7fOIAEcdwRUreFBUNVrZqiJPZQe6nn6V/5a ...@@ -76,6 +76,8 @@ github.com/ProtonMail/gopenpgp/v2 v2.4.5 h1:G7fOIAEcdwRUreFBUNVrZqiJPZQe6nn6V/5a
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 h1:/EcJsFIsE0ywShAJ+lNLafcaSd6GBhIzHsaBID5pGXw=
github.com/ProtonMail/gopenpgp/v2 v2.4.6/go.mod h1:ZW1KxHNG6q5LMgFKf9Ap/d2eVYeyGf5+fAUEAjJWtmo= github.com/ProtonMail/gopenpgp/v2 v2.4.6/go.mod h1:ZW1KxHNG6q5LMgFKf9Ap/d2eVYeyGf5+fAUEAjJWtmo=
github.com/ProtonMail/gopenpgp/v2 v2.4.7 h1:V3xeelvXgJiZXZuPtSSE+uYbtPw4RmbmyPqXDAESPhg=
github.com/ProtonMail/gopenpgp/v2 v2.4.7/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=
......
...@@ -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.6" ArmorHeaderVersion = "GopenPGP 2.4.7"
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.6" const Version = "2.4.7"
...@@ -438,12 +438,8 @@ func generateKey( ...@@ -438,12 +438,8 @@ func generateKey(
bits int, bits int,
prime1, prime2, prime3, prime4 []byte, prime1, prime2, prime3, prime4 []byte,
) (*Key, error) { ) (*Key, error) {
if len(email) == 0 { if len(email) == 0 && len(name) == 0 {
return nil, errors.New("gopenpgp: invalid email format") return nil, errors.New("gopenpgp: neither name nor email set.")
}
if len(name) == 0 {
return nil, errors.New("gopenpgp: invalid name format")
} }
comments := "" comments := ""
......
...@@ -45,7 +45,6 @@ func (keyRing *KeyRing) DecryptMIMEMessage( ...@@ -45,7 +45,6 @@ func (keyRing *KeyRing) DecryptMIMEMessage(
callbacks.OnError(embeddedSigError) callbacks.OnError(embeddedSigError)
callbacks.OnError(mimeSigError) callbacks.OnError(mimeSigError)
callbacks.OnVerified(prioritizeSignatureErrors(embeddedSigError, mimeSigError)) callbacks.OnVerified(prioritizeSignatureErrors(embeddedSigError, mimeSigError))
return
} else if verifyKey != nil { } else if verifyKey != nil {
callbacks.OnVerified(constants.SIGNATURE_OK) callbacks.OnVerified(constants.SIGNATURE_OK)
} }
......
...@@ -54,7 +54,7 @@ github.com/ProtonMail/go-crypto/openpgp/packet ...@@ -54,7 +54,7 @@ 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-20220302105931-303f85f7fe0f # 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.6 # github.com/ProtonMail/gopenpgp/v2 v2.4.7
## 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