merge from default JNI-26
authorHussein Kasem <huss@pep-project.org>
Fri, 20 Jan 2017 10:14:47 +0100
branchJNI-26
changeset 155178c0e9b079a0
parent 1550 19aa77ace10b
parent 1549 3c3cef4e9a42
child 1556 cf1858982be2
child 2707 89a9630c3371
merge from default
     1.1 --- a/src/message_api.c	Thu Jan 19 17:15:01 2017 +0100
     1.2 +++ b/src/message_api.c	Fri Jan 20 10:14:47 2017 +0100
     1.3 @@ -1922,15 +1922,6 @@
     1.4                         status = PEP_STATUS_OK;
     1.5                      if (status != PEP_STATUS_OK)
     1.6                          goto pep_error;
     1.7 -
     1.8 -                    // insert signer's in sender identity so that that new
     1.9 -                    // fpr has a chance to be used for trustwords computation
    1.10 -                    // when hanshaking after receiving message  
    1.11 -                    free(msg->from->fpr);
    1.12 -                    msg->from->fpr = strdup(fpr);
    1.13 -                    assert(msg->from->fpr);
    1.14 -                    if (msg->from->fpr == NULL)
    1.15 -                        goto enomem;
    1.16                  }
    1.17              }
    1.18          }