protonmail: Define struct MessageBodyKey.
This commit is contained in:
parent
71f1167182
commit
deb4662abb
|
@ -403,7 +403,7 @@ type MessagePackageSet struct {
|
||||||
Body string // Encrypted body data packet
|
Body string // Encrypted body data packet
|
||||||
|
|
||||||
// Only if cleartext is sent
|
// Only if cleartext is sent
|
||||||
BodyKey map[string]string
|
BodyKey *MessageBodyKey `json:omitempty`
|
||||||
AttachmentKeys map[string]string
|
AttachmentKeys map[string]string
|
||||||
|
|
||||||
bodyKey *packet.EncryptedKey
|
bodyKey *packet.EncryptedKey
|
||||||
|
@ -411,6 +411,11 @@ type MessagePackageSet struct {
|
||||||
signature int
|
signature int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type MessageBodyKey struct {
|
||||||
|
Algorithm string
|
||||||
|
Key string
|
||||||
|
}
|
||||||
|
|
||||||
func NewMessagePackageSet(attachmentKeys map[string]*packet.EncryptedKey) *MessagePackageSet {
|
func NewMessagePackageSet(attachmentKeys map[string]*packet.EncryptedKey) *MessagePackageSet {
|
||||||
return &MessagePackageSet{
|
return &MessagePackageSet{
|
||||||
Addresses: make(map[string]*MessagePackage),
|
Addresses: make(map[string]*MessagePackage),
|
||||||
|
@ -495,9 +500,10 @@ func (set *MessagePackageSet) AddCleartext(addr string) (*MessagePackage, error)
|
||||||
set.Type |= MessagePackageCleartext
|
set.Type |= MessagePackageCleartext
|
||||||
|
|
||||||
if set.BodyKey == nil || set.AttachmentKeys == nil {
|
if set.BodyKey == nil || set.AttachmentKeys == nil {
|
||||||
set.BodyKey = make(map[string]string, 2)
|
set.BodyKey = &MessageBodyKey{
|
||||||
set.BodyKey["Algorithm"] = "aes256"
|
Algorithm: "aes256",
|
||||||
set.BodyKey["Key"] = base64.StdEncoding.EncodeToString(set.bodyKey.Key)
|
Key: base64.StdEncoding.EncodeToString(set.bodyKey.Key),
|
||||||
|
}
|
||||||
|
|
||||||
set.AttachmentKeys = make(map[string]string, len(set.attachmentKeys))
|
set.AttachmentKeys = make(map[string]string, len(set.attachmentKeys))
|
||||||
for att, key := range set.attachmentKeys {
|
for att, key := range set.attachmentKeys {
|
||||||
|
|
Loading…
Reference in New Issue