From ed7a0dc9b32500db6c029bf1188e9941a1432dbf Mon Sep 17 00:00:00 2001 From: James Houlahan Date: Tue, 14 Jul 2020 16:43:06 +0200 Subject: [PATCH] fix: don't assume contact keys are armored --- Changelog.md | 1 + internal/smtp/user.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 33ff0545..06fd7624 100644 --- a/Changelog.md +++ b/Changelog.md @@ -65,6 +65,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/) * GODT-308 Reduce minimum read speed threshold to avoid issues with flaky internet. * GODT-321 Changing address ordering would cause all messages to disappear in combined mode. * GODT-129 Fix custom message PGP by using template. +* GODT-280 Don't assume contact keys are stored armored. ## [v1.2.8] Donghai-fix-append (beta 2020-06-XXX) diff --git a/internal/smtp/user.go b/internal/smtp/user.go index 8d431d66..70d9119c 100644 --- a/internal/smtp/user.go +++ b/internal/smtp/user.go @@ -250,7 +250,7 @@ func (su *smtpUser) Send(from string, to []string, messageReader io.Reader) (err return err } for _, contactRawKey := range contactMeta.Keys { - contactKey, err := crypto.NewKeyFromArmored(contactRawKey) + contactKey, err := crypto.NewKey([]byte(contactRawKey)) if err != nil { return err }