From f5803d148d037af9837d2809deaa9a53de22328f Mon Sep 17 00:00:00 2001 From: Aron Wussler Date: Mon, 25 Apr 2022 13:13:51 +0200 Subject: [PATCH] Do not return error on empty name or email key generation --- CHANGELOG.md | 1 + crypto/key.go | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 922a61f5..ff855bb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - `DecryptMIMEMessage` will return the decrypted content in the `OnBody` callback, even when there's a signature verification error. That lets the caller decide whether they want to use the content with a warning or hard fail on signature errors. +- Key generation functions no longer return an error if either the name or email is empty ## [2.4.6] 2022-03-25 diff --git a/crypto/key.go b/crypto/key.go index fb8a9502..16c50d98 100644 --- a/crypto/key.go +++ b/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 := ""