IOSAD-103 merge sync IOSAD-103
authorDirk Zimmermann <dz@pep.security>
Fri, 25 Jan 2019 08:51:44 +0100
branchIOSAD-103
changeset 3241e836e7688425
parent 3238 980c6913d510
parent 3240 80ee08316899
child 3252 6ae6df9f498d
IOSAD-103 merge sync
     1.1 --- a/src/message_api.h	Thu Jan 24 08:14:34 2019 +0100
     1.2 +++ b/src/message_api.h	Fri Jan 25 08:51:44 2019 +0100
     1.3 @@ -586,6 +586,16 @@
     1.4      PEP_rating x_enc_status,
     1.5      PEP_rating *rating
     1.6  );
     1.7 +
     1.8 +// TODO: Implement this - and don't even try to use your light saber
     1.9 +
    1.10 +DYNAMIC_API PEP_STATUS get_key_rating_for_user(
    1.11 +        PEP_SESSION session,
    1.12 +        char *user_id,
    1.13 +        char *fpr,
    1.14 +        PEP_rating *rating
    1.15 +    );
    1.16 +
    1.17  #ifdef __cplusplus
    1.18  }
    1.19  #endif
     2.1 --- a/sync/gen_statemachine.ysl2	Thu Jan 24 08:14:34 2019 +0100
     2.2 +++ b/sync/gen_statemachine.ysl2	Fri Jan 25 08:51:44 2019 +0100
     2.3 @@ -408,7 +408,10 @@
     2.4                              goto the_end;
     2.5  
     2.6                          if (!(channels && channels->ident)) {
     2.7 -                            status = PEP_«yml:ucase(@name)»_NO_CHANNEL;
     2.8 +                            // status = PEP_«yml:ucase(@name)»_NO_CHANNEL;
     2.9 +                            // we don't check for having a channel, because if
    2.10 +                            // this is initial setup before having an own
    2.11 +                            // identity we're fine
    2.12                              goto the_end;
    2.13                          }
    2.14                          break;