fix b0rken merge. *sigh* ENGINE-199
authorRoker <roker@pep-project.org>
Tue, 09 May 2017 09:49:09 +0200
branchENGINE-199
changeset 17651693d16c36ea
parent 1764 e1c31ee55aad
child 1766 f8f5f3dba9d7
fix b0rken merge. *sigh*
src/keymanagement.c
src/message_api.c
     1.1 --- a/src/keymanagement.c	Tue May 09 09:31:15 2017 +0200
     1.2 +++ b/src/keymanagement.c	Tue May 09 09:49:09 2017 +0200
     1.3 @@ -540,14 +540,6 @@
     1.4  
     1.5          if (status != PEP_STATUS_OK) 
     1.6          {
     1.7 -            status = elect_ownkey(session, identity);
     1.8 -            assert(status == PEP_STATUS_OK);
     1.9 -            if (status != PEP_STATUS_OK) {
    1.10 -                return ERROR(status);
    1.11 -            }
    1.12 -        } 
    1.13 -        else if (status != PEP_STATUS_OK) 
    1.14 -        {
    1.15              return ERROR(status);
    1.16          }
    1.17      }
     2.1 --- a/src/message_api.c	Tue May 09 09:31:15 2017 +0200
     2.2 +++ b/src/message_api.c	Tue May 09 09:49:09 2017 +0200
     2.3 @@ -2528,6 +2528,7 @@
     2.4      if (status == PEP_STATUS_OK)
     2.5      {
     2.6          free(tmp_msg);
     2.7 +        free(dec_msg);
     2.8          return ERROR(decrypt_status);
     2.9      }
    2.10