merging in default message-2.0
authorKrista Bennett <krista@pep-project.org>
Fri, 30 Jun 2017 08:14:59 +0200
branchmessage-2.0
changeset 1906104b801dc351
parent 1890 2f85b57d9964
parent 1899 77889e14ac3e
child 1907 5ae2e838afd6
merging in default
     1.1 --- a/src/message_api.c	Wed Jun 28 11:21:52 2017 +0200
     1.2 +++ b/src/message_api.c	Fri Jun 30 08:14:59 2017 +0200
     1.3 @@ -1213,8 +1213,11 @@
     1.4                  PEP_rating_undefined) < PEP_rating_reliable)
     1.5      {
     1.6          free_stringlist(keys);
     1.7 -        if (!session->passive_mode && !(flags & PEP_encrypt_flag_force_no_attached_key))
     1.8 +        if (!session->passive_mode && 
     1.9 +            !(flags & PEP_encrypt_flag_force_no_attached_key)) {
    1.10              attach_own_key(session, src);
    1.11 +            decorate_message(src, PEP_rating_undefined, NULL);
    1.12 +        }
    1.13          return ADD_TO_LOG(PEP_UNENCRYPTED);
    1.14      }
    1.15      else {