jarno
/
hydroxide-push
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Add support for internal sending

This commit is contained in:
emersion 2017-12-03 10:20:45 +01:00
parent ee7dae2c2f
commit 5efc14fefb
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
protonmail/messages.go
View File

@ -331,18 +331,17 @@ func (set *MessagePackageSet) AddCleartext(addr string) error {
}
func serializeEncryptedKey(symKey *packet.EncryptedKey, pub *packet.PublicKey, config *packet.Config) (string, error) {
var armored bytes.Buffer
ciphertext, err := armor.Encode(&armored, "PGP MESSAGE", nil)
var encoded bytes.Buffer
ciphertext := base64.NewEncoder(base64.StdEncoding, &encoded)
err := packet.SerializeEncryptedKey(ciphertext, pub, symKey.CipherFunc, symKey.Key, config)
if err != nil {
return "", err
}
err = packet.SerializeEncryptedKey(ciphertext, pub, symKey.CipherFunc, symKey.Key, config)
if err != nil {
return "", err
}
ciphertext.Close()
return armored.String(), nil
return encoded.String(), nil
}
func (set *MessagePackageSet) AddInternal(addr string, pub *openpgp.Entity) error {

22
smtp/smtp.go
View File

@ -210,7 +210,27 @@ func (u *user) Send(from string, to []string, r io.Reader) error {
}
if len(encryptedRecipients) > 0 {
// TODO
encryptedSet := protonmail.NewMessagePackageSet(nil)
plaintext, err := encryptedSet.Encrypt(bodyType)
if err != nil {
return err
}
if _, err := io.Copy(plaintext, bytes.NewReader(body.Bytes())); err != nil {
plaintext.Close()
return err
}
if err := plaintext.Close(); err != nil {
return err
}
for rcpt, pub := range encryptedRecipients {
if err := encryptedSet.AddInternal(rcpt, pub); err != nil {
return err
}
}
outgoing.Packages = append(outgoing.Packages, encryptedSet)
}
_, _, err = u.c.SendMessage(outgoing)