adding OIDs
authorVolker Birk <vb@pep-project.org>
Mon, 18 Jul 2016 10:15:06 +0200
changeset 9078f5cca5bfa2d
parent 904 a3c701c6109f
child 908 f3dd95d4315f
adding OIDs
asn.1/devicegroup.asn1
asn.1/pEp.asn1
src/sync_actions.c
sync/devicegroup.fsm
     1.1 --- a/asn.1/devicegroup.asn1	Mon Jul 18 08:54:11 2016 +0200
     1.2 +++ b/asn.1/devicegroup.asn1	Mon Jul 18 10:15:06 2016 +0200
     1.3 @@ -1,4 +1,5 @@
     1.4  DEVICEGROUP
     1.5 +    { iso(1) org(3) dod(6) internet(1) private(4) enterprise(1) pEp (47878) sync (1) keysync (1) }
     1.6  
     1.7  DEFINITIONS AUTOMATIC TAGS EXTENSIBILITY IMPLIED ::=
     1.8  
     2.1 --- a/asn.1/pEp.asn1	Mon Jul 18 08:54:11 2016 +0200
     2.2 +++ b/asn.1/pEp.asn1	Mon Jul 18 10:15:06 2016 +0200
     2.3 @@ -1,4 +1,5 @@
     2.4  PEP
     2.5 +    { iso(1) org(3) dod(6) internet(1) private(4) enterprise(1) pEp (47878) basic (0) }
     2.6  
     2.7  DEFINITIONS AUTOMATIC TAGS EXTENSIBILITY IMPLIED ::=
     2.8  
     3.1 --- a/src/sync_actions.c	Mon Jul 18 08:54:11 2016 +0200
     3.2 +++ b/src/sync_actions.c	Mon Jul 18 10:15:06 2016 +0200
     3.3 @@ -25,9 +25,9 @@
     3.4      PEP_STATUS status = PEP_STATUS_OK;
     3.5      assert(session);
     3.6      assert(partner);
     3.7 -    assert(session->showHandshake);
     3.8      if (!(session && partner))
     3.9          return PEP_ILLEGAL_VALUE;
    3.10 +    assert(session->showHandshake);
    3.11      if (!session->showHandshake)
    3.12          return PEP_SYNC_NO_TRUSTWORDS_CALLBACK;
    3.13  
    3.14 @@ -51,7 +51,7 @@
    3.15  }
    3.16  
    3.17  
    3.18 -// reject() - 
    3.19 +// reject() - stores rejection of partner
    3.20  //
    3.21  //  params:
    3.22  //      session (in)        session handle
     4.1 --- a/sync/devicegroup.fsm	Mon Jul 18 08:54:11 2016 +0200
     4.2 +++ b/sync/devicegroup.fsm	Mon Jul 18 10:15:06 2016 +0200
     4.3 @@ -36,8 +36,7 @@
     4.4              on Init
     4.5                  do showHandshake(partner);
     4.6              on HandshakeRejected(Identity partner) {
     4.7 -                do reject(partner);             // sends Reject to partner and
     4.8 -                                                // stores rejection of partner
     4.9 +                do reject(partner);             // stores rejection of partner
    4.10                  go Sole;
    4.11              }
    4.12              on HandshakeAccepted(Identity partner) {