merge IOS-1576 sync
authorbuff <andreas@pep-project.org>
Tue, 16 Jul 2019 14:59:27 +0200
branchsync
changeset 3932c487731d164d
parent 3927 fd89f666f4e4
parent 3930 dbd227c0fef8
child 3934 88d7900fa705
child 3935 578eeb202e26
child 3943 47d45beb5cd1
merge IOS-1576
     1.1 --- a/src/keymanagement.c	Mon Jul 15 15:56:17 2019 +0200
     1.2 +++ b/src/keymanagement.c	Tue Jul 16 14:59:27 2019 +0200
     1.3 @@ -249,7 +249,7 @@
     1.4          case PEP_ct_key_revoked:
     1.5          case PEP_ct_key_b0rken:
     1.6              // delete key from being default key for all users/identities
     1.7 -            status = remove_fpr_as_default(session, fpr); //BUFF: considers the key as "revoked" ...
     1.8 +            status = remove_fpr_as_default(session, fpr);
     1.9              status = update_trust_for_fpr(session, 
    1.10                                            fpr, 
    1.11                                            ct);
    1.12 @@ -257,7 +257,7 @@
    1.13              free(ident->fpr);
    1.14              ident->fpr = NULL;
    1.15              ident->comm_type = ct;            
    1.16 -            status = PEP_KEY_UNSUITABLE; //BUFF: ... and returns PEP_KEY_UNSUITABLE
    1.17 +            status = PEP_KEY_UNSUITABLE;
    1.18          default:
    1.19              break;
    1.20      }            
     2.1 --- a/sync/sync.fsm	Mon Jul 15 15:56:17 2019 +0200
     2.2 +++ b/sync/sync.fsm	Tue Jul 16 14:59:27 2019 +0200
     2.3 @@ -10,7 +10,7 @@
     2.4  protocol Sync 1 {
     2.5      // all messages have a timestamp, time out and are removed after timeout
     2.6  
     2.7 -    fsm KeySync 1, threshold=60 {
     2.8 +    fsm KeySync 1, threshold=300 {
     2.9          version 1, 2;
    2.10  
    2.11          state InitState {