Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-23 10:26:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: don't assume contact keys are armored

Browse Source
This commit is contained in:
James Houlahan
2020-07-14 16:43:06 +02:00
parent fc4e77604f
commit ed7a0dc9b3
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -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-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-321 Changing address ordering would cause all messages to disappear in combined mode.
* GODT-129 Fix custom message PGP by using template. * 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) ## [v1.2.8] Donghai-fix-append (beta 2020-06-XXX)

2
internal/smtp/user.go
View File

@ -250,7 +250,7 @@ func (su *smtpUser) Send(from string, to []string, messageReader io.Reader) (err
return err return err
} }
for _, contactRawKey := range contactMeta.Keys { for _, contactRawKey := range contactMeta.Keys {
contactKey, err := crypto.NewKeyFromArmored(contactRawKey) contactKey, err := crypto.NewKey([]byte(contactRawKey))
if err != nil { if err != nil {
return err return err
} }