From 9a6f7187a5650da94670427b46e14c3d663269d8 Mon Sep 17 00:00:00 2001 From: Brandon McDonnell Date: Sat, 20 Oct 2018 14:30:03 +0000 Subject: [PATCH] protonmail: Update MessagePackageSet BodyKey for new API. --- protonmail/messages.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/protonmail/messages.go b/protonmail/messages.go index 8c79d8e..9c1c85c 100644 --- a/protonmail/messages.go +++ b/protonmail/messages.go @@ -403,7 +403,7 @@ type MessagePackageSet struct { Body string // Encrypted body data packet // Only if cleartext is sent - BodyKey string + BodyKey map[string]string AttachmentKeys map[string]string bodyKey *packet.EncryptedKey @@ -494,8 +494,10 @@ func (set *MessagePackageSet) AddCleartext(addr string) (*MessagePackage, error) set.Addresses[addr] = pkg set.Type |= MessagePackageCleartext - if set.BodyKey == "" || set.AttachmentKeys == nil { - set.BodyKey = base64.StdEncoding.EncodeToString(set.bodyKey.Key) + if set.BodyKey == nil || set.AttachmentKeys == nil { + set.BodyKey = make(map[string]string, 2) + set.BodyKey["Algorithm"] = "aes256" + set.BodyKey["Key"] = base64.StdEncoding.EncodeToString(set.bodyKey.Key) set.AttachmentKeys = make(map[string]string, len(set.attachmentKeys)) for att, key := range set.attachmentKeys {