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 (
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
......
......@@ -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"
......
package constants
const Version = "2.4.6"
const Version = "2.4.7"
......@@ -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 := ""
......
......@@ -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)
}
......
......@@ -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
......
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