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

go.mod

@@ -8,7 +8,7 @@ require (
 	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/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-test/deep v1.0.7
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect

go.sum

@@ -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.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.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/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=

vendor/github.com/ProtonMail/gopenpgp/v2/constants/armor.go

@@ -3,7 +3,7 @@ package constants
 
 // Constants for armored data.
 const (
-	ArmorHeaderVersion = "GopenPGP 2.4.6"
+	ArmorHeaderVersion = "GopenPGP 2.4.7"
 	ArmorHeaderComment = "https://gopenpgp.org"
 	PGPMessageHeader   = "PGP MESSAGE"
 	PGPSignatureHeader = "PGP SIGNATURE"

vendor/github.com/ProtonMail/gopenpgp/v2/constants/version.go

 package constants
 
-const Version = "2.4.6"
+const Version = "2.4.7"

vendor/github.com/ProtonMail/gopenpgp/v2/crypto/key.go

@@ -438,12 +438,8 @@ func generateKey(
 	bits int,
 	prime1, prime2, prime3, prime4 []byte,
 ) (*Key, error) {
-	if len(email) == 0 {
-		return nil, errors.New("gopenpgp: invalid email format")
-	}
-
-	if len(name) == 0 {
-		return nil, errors.New("gopenpgp: invalid name format")
+	if len(email) == 0 && len(name) == 0 {
+		return nil, errors.New("gopenpgp: neither name nor email set.")
 	}
 
 	comments := ""

vendor/github.com/ProtonMail/gopenpgp/v2/crypto/mime.go

@@ -45,7 +45,6 @@ func (keyRing *KeyRing) DecryptMIMEMessage(
 		callbacks.OnError(embeddedSigError)
 		callbacks.OnError(mimeSigError)
 		callbacks.OnVerified(prioritizeSignatureErrors(embeddedSigError, mimeSigError))
-		return
 	} else if verifyKey != nil {
 		callbacks.OnVerified(constants.SIGNATURE_OK)
 	}

vendor/modules.txt

@@ -54,7 +54,7 @@ github.com/ProtonMail/go-crypto/openpgp/packet
 github.com/ProtonMail/go-crypto/openpgp/s2k
 # github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f
 github.com/ProtonMail/go-mime
-# github.com/ProtonMail/gopenpgp/v2 v2.4.6
+# github.com/ProtonMail/gopenpgp/v2 v2.4.7
 ## explicit
 github.com/ProtonMail/gopenpgp/v2/armor
 github.com/ProtonMail/gopenpgp/v2/constants