including diistribution sync
authorVolker Birk <vb@pep.foundation>
Sat, 28 Dec 2019 00:57:07 +0100
branchsync
changeset 4293327480b07e3d
parent 4292 91bd76bcb978
child 4294 30630e8d26b5
including diistribution
build-windows/pEpEngine.vcxproj
build-windows/pEpEngine.vcxproj.filters
src/message_api.c
src/pEpEngine.c
     1.1 --- a/build-windows/pEpEngine.vcxproj	Fri Dec 27 23:42:57 2019 +0100
     1.2 +++ b/build-windows/pEpEngine.vcxproj	Sat Dec 28 00:57:07 2019 +0100
     1.3 @@ -134,11 +134,13 @@
     1.4      <ClCompile Include="..\src\blacklist.c" />
     1.5      <ClCompile Include="..\src\bloblist.c" />
     1.6      <ClCompile Include="..\src\cryptotech.c" />
     1.7 +    <ClCompile Include="..\src\distribution_codec.c" />
     1.8      <ClCompile Include="..\src\email.c" />
     1.9      <ClCompile Include="..\src\etpan_mime.c" />
    1.10      <ClCompile Include="..\src\growing_buf.c" />
    1.11      <ClCompile Include="..\src\identity_list.c" />
    1.12      <ClCompile Include="..\src\keymanagement.c" />
    1.13 +    <ClCompile Include="..\src\keyreset_command.c" />
    1.14      <ClCompile Include="..\src\KeySync_fsm.c" />
    1.15      <ClCompile Include="..\src\key_reset.c" />
    1.16      <ClCompile Include="..\src\labeled_int_list.c" />
     2.1 --- a/build-windows/pEpEngine.vcxproj.filters	Fri Dec 27 23:42:57 2019 +0100
     2.2 +++ b/build-windows/pEpEngine.vcxproj.filters	Sat Dec 28 00:57:07 2019 +0100
     2.3 @@ -120,6 +120,12 @@
     2.4      <ClCompile Include="..\src\etpan_mime.c">
     2.5        <Filter>Quelldateien</Filter>
     2.6      </ClCompile>
     2.7 +    <ClCompile Include="..\src\keyreset_command.c">
     2.8 +      <Filter>Quelldateien</Filter>
     2.9 +    </ClCompile>
    2.10 +    <ClCompile Include="..\src\distribution_codec.c">
    2.11 +      <Filter>Quelldateien</Filter>
    2.12 +    </ClCompile>
    2.13    </ItemGroup>
    2.14    <ItemGroup>
    2.15      <ClInclude Include="..\src\keymanagement.h">
     3.1 --- a/src/message_api.c	Fri Dec 27 23:42:57 2019 +0100
     3.2 +++ b/src/message_api.c	Sat Dec 28 00:57:07 2019 +0100
     3.3 @@ -2995,7 +2995,7 @@
     3.4          return PEP_ILLEGAL_VALUE;
     3.5  
     3.6      PEP_STATUS status = PEP_STATUS_OK;
     3.7 -    *imported_keys = NULL;
     3.8 +    *imported_keys = false;
     3.9      *imported_private = false;
    3.10      if (private_il)
    3.11          *private_il = NULL;
     4.1 --- a/src/pEpEngine.c	Fri Dec 27 23:42:57 2019 +0100
     4.2 +++ b/src/pEpEngine.c	Sat Dec 28 00:57:07 2019 +0100
     4.3 @@ -627,7 +627,7 @@
     4.4  PEP_STATUS repair_altered_tables(PEP_SESSION session) {
     4.5      PEP_STATUS status = PEP_STATUS_OK;
     4.6      
     4.7 -    const unsigned int _PEP_MAX_AFFECTED = 5;
     4.8 +    const int _PEP_MAX_AFFECTED = 5;
     4.9      char** table_names = calloc(_PEP_MAX_AFFECTED, sizeof(char*));
    4.10      if (!table_names)
    4.11          return PEP_OUT_OF_MEMORY;