Merged in default sync
authorKrista Bennett <krista@pep-project.org>
Tue, 11 Dec 2018 14:29:40 +0100
branchsync
changeset 3184557a689068aa
parent 3180 f7ce02c58571
parent 3183 324de911c575
child 3185 a5c137f87a9c
child 3187 9376fbf0c026
child 3194 40948fabe025
child 3195 47da24127579
Merged in default
src/keymanagement.c
src/message_api.c
src/message_api.h
     1.1 --- a/src/keymanagement.c	Tue Dec 11 13:46:26 2018 +0100
     1.2 +++ b/src/keymanagement.c	Tue Dec 11 14:29:40 2018 +0100
     1.3 @@ -1408,10 +1408,10 @@
     1.4          if (status != PEP_STATUS_OK && status != PEP_KEY_NOT_FOUND)
     1.5              goto pEp_free;
     1.6              
     1.7 -        if (has_private) {
     1.8 -            status = set_own_key(session, ident_copy, ident->fpr); 
     1.9 -            goto pEp_free;
    1.10 -        }
    1.11 +        // if (has_private) {
    1.12 +        //     status = set_own_key(session, ident_copy, ident->fpr); 
    1.13 +        //     goto pEp_free;
    1.14 +        // }
    1.15      }
    1.16      
    1.17      // Either it's not me, or it's me but the key has no private key. 
     2.1 --- a/src/message_api.c	Tue Dec 11 13:46:26 2018 +0100
     2.2 +++ b/src/message_api.c	Tue Dec 11 14:29:40 2018 +0100
     2.3 @@ -2311,7 +2311,8 @@
     2.4      *signature_blob = NULL;
     2.5  
     2.6      while (attach_curr) {
     2.7 -        if (strcasecmp(attach_curr->mime_type, "application/pgp-signature") == 0) {
     2.8 +        if (attach_curr->mime_type &&
     2.9 +            (strcasecmp(attach_curr->mime_type, "application/pgp-signature") == 0)) {
    2.10              *signature_blob = attach_curr;
    2.11              break;
    2.12          }
     3.1 --- a/src/message_api.h	Tue Dec 11 13:46:26 2018 +0100
     3.2 +++ b/src/message_api.h	Tue Dec 11 14:29:40 2018 +0100
     3.3 @@ -58,7 +58,9 @@
     3.4  //
     3.5  //  parameters:
     3.6  //      session (in)        session handle
     3.7 -//      src (in)            message to encrypt
     3.8 +//      src (inout)         message to encrypt - usually in-only, but can be 
     3.9 +//                          in-out for unencrypted messages; in that case, 
    3.10 +//                          we may attach the key and decorate the message
    3.11  //      extra (in)          extra keys for encryption
    3.12  //      dst (out)           pointer to new encrypted message or NULL if no
    3.13  //                          encryption could take place