merge sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Tue, 09 Apr 2019 09:36:39 +0200
branchsync
changeset 3474b8af3a8121c3
parent 3471 3e68b40d3978
parent 3470 3f5f6d631953
child 3475 71e0a8ae558f
merge
     1.1 --- a/build-android/jni/Android.mk	Tue Apr 09 09:05:49 2019 +0200
     1.2 +++ b/build-android/jni/Android.mk	Tue Apr 09 09:36:39 2019 +0200
     1.3 @@ -37,7 +37,7 @@
     1.4  $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)../../)
     1.5  LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include
     1.6  
     1.7 -ENGINE_SRC_FILES := $(shell find $(LOCAL_PATH)/../../src/ ! -name "*netpgp*" -name "*.c")
     1.8 +ENGINE_SRC_FILES := $(shell find $(LOCAL_PATH)/../../src/ ! -name "*sequoia*" ! -name "*netpgp*" -name "*.c")
     1.9  #ENGINE_SRC_FILES := $(wildcard $(LOCAL_PATH)/../../src/*.c)
    1.10  ASN1_SRC_FILES := $(wildcard $(LOCAL_PATH)/../../asn.1/*.c)
    1.11  LOCAL_SRC_FILES := $(ENGINE_SRC_FILES:%=%)  $(ASN1_SRC_FILES:$(LOCAL_PATH)/%=%)
     2.1 --- a/build-android/jni/Application.mk	Tue Apr 09 09:05:49 2019 +0200
     2.2 +++ b/build-android/jni/Application.mk	Tue Apr 09 09:36:39 2019 +0200
     2.3 @@ -1,4 +1,4 @@
     2.4  APP_OPTIM := debug
     2.5  APP_PLATFORM=android-21
     2.6  APP_ABI := armeabi-v7a
     2.7 -NDK_TOOLCHAIN_VERSION = 4.8
     2.8 +NDK_TOOLCHAIN_VERSION = clang
     3.1 --- a/sync/cond_act_sync.yml2	Tue Apr 09 09:05:49 2019 +0200
     3.2 +++ b/sync/cond_act_sync.yml2	Tue Apr 09 09:36:39 2019 +0200
     3.3 @@ -37,14 +37,6 @@
     3.4      *result = t1->size == t2->size && memcmp(t1->buf, t2->buf, t1->size) == 0;
     3.5  ||
     3.6  
     3.7 -condition notMe
     3.8 -||
     3.9 -    TID_t *t1 = &session->sync_state.keysync.me;
    3.10 -    TID_t *t2 = &session->own_sync_state.me;
    3.11 -
    3.12 -    *result = t1->size != t2->size || memcmp(t1->buf, t2->buf, t1->size) != 0;
    3.13 -||
    3.14 -
    3.15  condition keyElectionWon
    3.16  ||
    3.17      pEp_identity *from = session->sync_state.common.from;
    3.18 @@ -115,14 +107,6 @@
    3.19      with "dst" > &session->own_sync_state.transaction
    3.20  }
    3.21  
    3.22 -action identifySole {
    3.23 -    call "new_UUID" with "dst" > &session->own_sync_state.me
    3.24 -    call "copy_UUID" {
    3.25 -        with "src" > &session->own_sync_state.me
    3.26 -        with "dst" > &session->sync_state.keysync.me
    3.27 -    }
    3.28 -}
    3.29 -
    3.30  function "show_handshake" {
    3.31      param "type";
    3.32      ||
     4.1 --- a/sync/sync.fsm	Tue Apr 09 09:05:49 2019 +0200
     4.2 +++ b/sync/sync.fsm	Tue Apr 09 09:36:39 2019 +0200
     4.3 @@ -61,10 +61,8 @@
     4.4  
     4.5          // handshaking without existing Device group
     4.6          state HandshakingNew {
     4.7 -            on Init {
     4.8 -                do identifySole;
     4.9 +            on Init
    4.10                  do showSoleHandshake;
    4.11 -            }
    4.12  
    4.13              // Cancel is Rollback
    4.14              on Cancel {
    4.15 @@ -89,14 +87,12 @@
    4.16  
    4.17              // Accept is Phase1Commit
    4.18              on Accept {
    4.19 -                send CommitAccept;
    4.20 +                send CommitAcceptForGroup;
    4.21                  go HandshakingNewPhase1;
    4.22              }
    4.23  
    4.24 -            on CommitAccept {
    4.25 -                if notMe
    4.26 -                    go HandshakingNewPhase1Own;
    4.27 -            }
    4.28 +            on CommitAccept
    4.29 +                go HandshakingNewPhase1Own;
    4.30          }
    4.31  
    4.32          state HandshakingNewPhase1 {
    4.33 @@ -108,9 +104,8 @@
    4.34                  go End;
    4.35              }
    4.36  
    4.37 -            on CommitAccept
    4.38 -                if notMe
    4.39 -                    go NewGroup;
    4.40 +            on CommitAcceptForGroup
    4.41 +                go NewGroup;
    4.42          }
    4.43  
    4.44          state HandshakingNewPhase1Own {
    4.45 @@ -126,8 +121,7 @@
    4.46              }
    4.47  
    4.48              on Accept
    4.49 -                if notMe
    4.50 -                    go NewGroup;
    4.51 +                go NewGroup;
    4.52          }
    4.53  
    4.54          state NewGroup {
    4.55 @@ -335,7 +329,6 @@
    4.56  
    4.57          message CommitAccept 7 {
    4.58              field TID transaction;
    4.59 -            field TID me;
    4.60          }
    4.61  
    4.62          message CommitAcceptForGroup 8 {
     5.1 --- a/test/Makefile	Tue Apr 09 09:05:49 2019 +0200
     5.2 +++ b/test/Makefile	Tue Apr 09 09:36:39 2019 +0200
     5.3 @@ -97,13 +97,15 @@
     5.4  
     5.5  .PHONY: all clean test
     5.6  
     5.7 -all: src/SuiteMaker.cc
     5.8 +all:
     5.9 +	make .suitemaker
    5.10  	make $(TARGET) .scripts
    5.11 +	touch .suitemaker
    5.12  
    5.13  %.d: %.cc
    5.14  	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< | sed -e 's,\($*\)\.o[ :]*,\1.o $@: ,g' > $@
    5.15  
    5.16 -src/SuiteMaker.cc: gensuitemaker.py $(filter-out src/SuiteMaker.cc,$(SRCS))
    5.17 +.suitemaker: src
    5.18  ifndef PY_ENV
    5.19  	@echo "WARNING: Can't find python3 - this is fine unless you're adding test suites. If so, please install python3."
    5.20  else
    5.21 @@ -113,7 +115,6 @@
    5.22  	# Comma-separated list, no spaces
    5.23  	$(PY_ENV) gensuitemaker.py --exclude=$(EXCLUDE)
    5.24  endif
    5.25 -	touch .suitemaker
    5.26  endif
    5.27  
    5.28  $(TARGET): $(OBJS)
    5.29 @@ -130,7 +131,7 @@
    5.30  
    5.31  clean:
    5.32  	$(RM) $(TARGET) $(TARGET).o $(TARGET).d $(OBJS) $(notdir $(basename $(OBJS))) $(DEPS)
    5.33 -	$(RM) $(HERE)/*Tests msg_2.0.asc $(HERE)/pEp_test_home .scripts
    5.34 +	$(RM) $(HERE)/*Tests msg_2.0.asc $(HERE)/pEp_test_home .scripts .suitemaker
    5.35  
    5.36  # If only the goal 'clean' is given, do not generate and include the '%.d' files.¬
    5.37  ifneq ($(MAKECMDGOALS),clean)