Merged in default ENGINE-423
authorKrista Bennett <krista@pep-project.org>
Thu, 03 May 2018 14:38:57 +0200
branchENGINE-423
changeset 26460e07dcbd07f9
parent 2643 ec3bb2ae2fdf
parent 2630 5f5f392090b8
child 2647 538d85643401
child 2648 69fbeb24eec6
Merged in default
src/message_api.c
     1.1 --- a/src/message_api.c	Wed May 02 17:07:44 2018 +0200
     1.2 +++ b/src/message_api.c	Thu May 03 14:38:57 2018 +0200
     1.3 @@ -1764,7 +1764,7 @@
     1.4      else {
     1.5          // FIXME - we need to deal with transport types (via flag)
     1.6          if ((max_comm_type | PEP_ct_confirmed) == PEP_ct_pEp) {
     1.7 -            _src = wrap_message_as_attachment(NULL, src, session->unencrypted_subject);
     1.8 +            _src = wrap_message_as_attachment(NULL, src, false);
     1.9              if (!_src)
    1.10                  goto pep_error;
    1.11          }
    1.12 @@ -2105,7 +2105,7 @@
    1.13      // if (!(flags & PEP_encrypt_flag_force_no_attached_key))
    1.14      //     _attach_key(session, target_fpr, src);
    1.15  
    1.16 -    _src = wrap_message_as_attachment(NULL, src, session->unencrypted_subject);
    1.17 +    _src = wrap_message_as_attachment(NULL, src, false);
    1.18      if (!_src)
    1.19          goto pep_error;
    1.20  
     2.1 --- a/test/encrypt_attach_private_key_test.cc	Wed May 02 17:07:44 2018 +0200
     2.2 +++ b/test/encrypt_attach_private_key_test.cc	Thu May 03 14:38:57 2018 +0200
     2.3 @@ -161,6 +161,7 @@
     2.4      // Same address, same_user_id, trusted
     2.5      cout << "Case 2: Same address, same user_id, trusted" << endl;
     2.6      status = trust_personal_key(session, same_addr_same_uid);
     2.7 +    cout << "Trust personal key for " << same_addr_same_uid << " gives status " << tl_status_string(status) << " (" << status << ")" << endl;
     2.8      assert(status == PEP_STATUS_OK);
     2.9      message* enc_same_addr_same_uid_trusted = NULL;
    2.10      status = encrypt_message_and_add_priv_key(session,
     3.1 --- a/test/test_util.cc	Wed May 02 17:07:44 2018 +0200
     3.2 +++ b/test/test_util.cc	Thu May 03 14:38:57 2018 +0200
     3.3 @@ -206,6 +206,7 @@
     3.4          case PEP_UNKNOWN_ERROR:
     3.5              return "PEP_UNKNOWN_ERROR";
     3.6          default:
     3.7 + 
     3.8              return "PEP_STATUS_OMGWTFBBQ - This means you're using a status the test lib doesn't know about!";
     3.9      }
    3.10  }