inline... sync
authorVolker Birk <vb@pep-project.org>
Wed, 15 May 2019 23:10:48 +0200
branchsync
changeset 369685e7996b3a59
parent 3695 88a1333de5f0
child 3697 3510f2f2e109
child 3698 4bc3ed727f1a
inline...
src/message_api.c
     1.1 --- a/src/message_api.c	Wed May 15 22:34:08 2019 +0200
     1.2 +++ b/src/message_api.c	Wed May 15 23:10:48 2019 +0200
     1.3 @@ -1021,11 +1021,6 @@
     1.4          return PEP_OUT_OF_MEMORY;
     1.5      dst->attachments = bl;
     1.6  
     1.7 -    if ((!session->passive_mode) && 
     1.8 -        !(flags & PEP_encrypt_flag_force_no_attached_key)) {
     1.9 -        attach_own_key(session, dst);
    1.10 -    }
    1.11 -
    1.12      return PEP_STATUS_OK;
    1.13  }
    1.14  
    1.15 @@ -1943,7 +1938,7 @@
    1.16      }
    1.17      else {
    1.18          // FIXME - we need to deal with transport types (via flag)
    1.19 -        if ((!force_v_1) && ((max_comm_type | PEP_ct_confirmed) == PEP_ct_pEp)) {
    1.20 +        if ((enc_format != PEP_enc_inline) && (!force_v_1) && ((max_comm_type | PEP_ct_confirmed) == PEP_ct_pEp)) {
    1.21              message_wrap_type wrap_type = ((flags & PEP_encrypt_flag_key_reset_only) ? PEP_message_key_reset : PEP_message_default);
    1.22              _src = wrap_message_as_attachment(NULL, src, wrap_type, false);
    1.23              if (!_src)