ENGINE-109: merge with default. ENGINE-109
authorKrista Grothoff <krista@pep-project.org>
Tue, 18 Oct 2016 00:32:43 +0200
branchENGINE-109
changeset 1294a171d8b09669
parent 1293 4f598c491fdf
parent 1291 e17f94b55b0c
child 1295 c0feb83c428b
child 1296 9491e990650c
ENGINE-109: merge with default.
     1.1 --- a/src/keymanagement.c	Tue Oct 18 00:32:01 2016 +0200
     1.2 +++ b/src/keymanagement.c	Tue Oct 18 00:32:43 2016 +0200
     1.3 @@ -178,9 +178,6 @@
     1.4              assert(status != PEP_OUT_OF_MEMORY);
     1.5              if (status == PEP_OUT_OF_MEMORY)
     1.6                  goto exit_free;
     1.7 -            status = get_trust(session, temp_id);
     1.8 -            if (status == PEP_OUT_OF_MEMORY)
     1.9 -                goto exit_free;
    1.10              if (_comm_type_key < PEP_ct_unconfirmed_encryption) {
    1.11                  temp_id->comm_type = _comm_type_key;
    1.12              } else{