merged in default ENGINE-214
authorKrista Bennett <krista@pep-project.org>
Fri, 13 Oct 2017 13:22:32 +0200
branchENGINE-214
changeset 2158c96ee66f4fc8
parent 2151 9bc683c97475
parent 2154 326bdd83df88
child 2159 b417e92107ab
child 2722 3e3aa7f12030
merged in default
     1.1 --- a/src/message_api.c	Tue Oct 10 15:03:17 2017 +0200
     1.2 +++ b/src/message_api.c	Fri Oct 13 13:22:32 2017 +0200
     1.3 @@ -3025,6 +3025,9 @@
     1.4          GOTO(pep_error);
     1.5      }
     1.6  
     1.7 +    // Clear the encryption status, or mime_encode will ignore
     1.8 +    // the plaintext and do all sorts of other stupid things
     1.9 +    enc_msg->enc_format = PEP_enc_none;
    1.10      status = mime_encode_message(enc_msg, false, mime_ciphertext);
    1.11  
    1.12  pep_error:
     2.1 --- a/src/mime.c	Tue Oct 10 15:03:17 2017 +0200
     2.2 +++ b/src/mime.c	Fri Oct 13 13:22:32 2017 +0200
     2.3 @@ -819,14 +819,12 @@
     2.4  	struct mailmime_parameter * param;
     2.5      int r;
     2.6      PEP_STATUS status;
     2.7 -    //char *subject;
     2.8      char *plaintext;
     2.9      size_t plaintext_size;
    2.10  
    2.11      assert(msg->attachments && msg->attachments->next &&
    2.12              msg->attachments->next->value);
    2.13  
    2.14 -    //subject = (msg->shortmsg) ? msg->shortmsg : "pEp"; // not used, yet.
    2.15      plaintext = msg->attachments->next->value;
    2.16      plaintext_size = msg->attachments->next->size;
    2.17