From b67cd478bf45fb1c19a83b49816c815fa12b81ad Mon Sep 17 00:00:00 2001 From: Volker Birk Date: Wed, 15 Aug 2018 18:31:02 +0200 Subject: [PATCH] ... --- src/Makefile | 4 ++-- src/pEp_internal.h | 2 +- src/{sync.c => sync_api.c} | 0 src/{sync.h => sync_api.h} | 8 +++++--- sync/gen_statemachine.ysl2 | 5 +++-- test/convenience_scripts/mime_decrypt.cc | 2 +- test/convenience_scripts/mime_encrypt_decrypt.cc | 2 +- test/pEpEngineTest.cc | 4 ++-- test/src/EngineTestSuite.cc | 2 +- test/src/util/test_util.cc | 8 ++++---- 10 files changed, 20 insertions(+), 17 deletions(-) rename src/{sync.c => sync_api.c} (100%) rename src/{sync.h => sync_api.h} (95%) diff --git a/src/Makefile b/src/Makefile index 205ab493..f93b44ce 100644 --- a/src/Makefile +++ b/src/Makefile @@ -89,8 +89,8 @@ install: $(TARGET) mkdir -p $(PREFIX)/include/pEp cp -v pEpEngine.h keymanagement.h message_api.h dynamic_api.h stringlist.h \ timestamp.h identity_list.h bloblist.h stringpair.h message.h mime.h \ - cryptotech.h sync.h sync_fsm.h sync_app.h blacklist.h pEp_string.h \ - openpgp_compat.h $(PREFIX)/include/pEp/ + cryptotech.h sync_api.h blacklist.h pEp_string.h openpgp_compat.h \ + ../asn.1/*.h $(PREFIX)/include/pEp/ .PHONY: uninstall uninstall: diff --git a/src/pEp_internal.h b/src/pEp_internal.h index 9d8afbad..288162ef 100644 --- a/src/pEp_internal.h +++ b/src/pEp_internal.h @@ -106,7 +106,7 @@ #include "keymanagement.h" #include "cryptotech.h" #include "transport.h" -#include "sync.h" +#include "sync_api.h" #include "Sync_func.h" #define NOT_IMPLEMENTED assert(0); return PEP_UNKNOWN_ERROR; diff --git a/src/sync.c b/src/sync_api.c similarity index 100% rename from src/sync.c rename to src/sync_api.c diff --git a/src/sync.h b/src/sync_api.h similarity index 95% rename from src/sync.h rename to src/sync_api.h index 3d9e96d4..6ebbddbb 100644 --- a/src/sync.h +++ b/src/sync_api.h @@ -5,7 +5,6 @@ #include "message.h" -#include "Sync_event.h" #ifdef __cplusplus @@ -75,6 +74,9 @@ DYNAMIC_API PEP_STATUS deliverHandshakeResult( ); +struct Sync_event; +typedef struct Sync_event *SYNC_EVENT; + // inject_sync_event - inject sync protocol message // // parameters: @@ -84,7 +86,7 @@ DYNAMIC_API PEP_STATUS deliverHandshakeResult( // return value: // 0 if event could be stored successfully or nonzero otherwise -typedef int (*inject_sync_event_t)(Sync_event_t *ev, void *management); +typedef int (*inject_sync_event_t)(SYNC_EVENT ev, void *management); // retrieve_next_sync_event - receive next sync event @@ -95,7 +97,7 @@ typedef int (*inject_sync_event_t)(Sync_event_t *ev, void *management); // return value: // next event -typedef Sync_event_t *(*retrieve_next_sync_event_t)(void *management); +typedef SYNC_EVENT (*retrieve_next_sync_event_t)(void *management); // register_sync_callbacks() - register adapter's callbacks diff --git a/sync/gen_statemachine.ysl2 b/sync/gen_statemachine.ysl2 index c068b621..d5f1390e 100644 --- a/sync/gen_statemachine.ysl2 +++ b/sync/gen_statemachine.ysl2 @@ -27,10 +27,10 @@ tstylesheet { extern "C" { #endif - #include "../asn.1/«@name».h" + #include "«@name».h" - typedef struct _«@name»_event { + typedef struct «@name»_event { «@name»_PR fsm; int event; «@name»_t *msg; @@ -532,6 +532,7 @@ tstylesheet { // see LICENSE.txt #include "«@name»_fsm.h" + #include const char *«@name»_state_name(int state) { diff --git a/test/convenience_scripts/mime_decrypt.cc b/test/convenience_scripts/mime_decrypt.cc index 079aa5ca..b08a9fe9 100644 --- a/test/convenience_scripts/mime_decrypt.cc +++ b/test/convenience_scripts/mime_decrypt.cc @@ -20,7 +20,7 @@ int main(int argc, char* argv[]) { PEP_SESSION session; cout << "calling init()\n"; - PEP_STATUS status = init(&session); + PEP_STATUS status = init(&session, NULL); assert(status == PEP_STATUS_OK); assert(session); cout << "init() completed.\n"; diff --git a/test/convenience_scripts/mime_encrypt_decrypt.cc b/test/convenience_scripts/mime_encrypt_decrypt.cc index 7346cf61..7392f576 100644 --- a/test/convenience_scripts/mime_encrypt_decrypt.cc +++ b/test/convenience_scripts/mime_encrypt_decrypt.cc @@ -20,7 +20,7 @@ int main(int argc, char* argv[]) { PEP_SESSION session; cout << "calling init()\n"; - PEP_STATUS status = init(&session); + PEP_STATUS status = init(&session, NULL); assert(status == PEP_STATUS_OK); assert(session); cout << "init() completed.\n"; diff --git a/test/pEpEngineTest.cc b/test/pEpEngineTest.cc index 634466ac..419857b5 100644 --- a/test/pEpEngineTest.cc +++ b/test/pEpEngineTest.cc @@ -96,14 +96,14 @@ int main(int argc, char* argv[]) PEP_SESSION session; cout << "calling init()\n"; - PEP_STATUS init_result = init(&session); + PEP_STATUS init_result = init(&session, NULL); cout << "returning from init() with result == " << status(init_result) << endl; assert(init_result == PEP_STATUS_OK); PEP_SESSION second_session; cout << "second session test\n"; - PEP_STATUS second_init_result = init(&second_session); + PEP_STATUS second_init_result = init(&second_session, NULL); cout << "returning from second init() with result == " << status(second_init_result) << endl; assert(second_init_result == PEP_STATUS_OK); assert(second_session); diff --git a/test/src/EngineTestSuite.cc b/test/src/EngineTestSuite.cc index f9b2495c..f1d445a0 100644 --- a/test/src/EngineTestSuite.cc +++ b/test/src/EngineTestSuite.cc @@ -116,7 +116,7 @@ void EngineTestSuite::set_full_env() { gpg_agent_conf(true); // cout << "calling init()\n"; - PEP_STATUS status = init(&session); + PEP_STATUS status = init(&session, NULL); assert(status == PEP_STATUS_OK); assert(session); // cout << "init() completed.\n"; diff --git a/test/src/util/test_util.cc b/test/src/util/test_util.cc index 0db9ccf0..34518fae 100644 --- a/test/src/util/test_util.cc +++ b/test/src/util/test_util.cc @@ -186,10 +186,10 @@ const char* tl_status_string(PEP_STATUS status) { return "PEP_CANNOT_SET_SEQUENCE_VALUE"; case PEP_OWN_SEQUENCE: return "PEP_OWN_SEQUENCE"; - case PEP_SYNC_STATEMACHINE_ERROR: - return "PEP_SYNC_STATEMACHINE_ERROR"; - case PEP_SYNC_NO_TRUST: - return "PEP_SYNC_NO_TRUST"; + case PEP_STATEMACHINE_ERROR: + return "PEP_STATEMACHINE_ERROR"; + case PEP_NO_TRUST: + return "PEP_NO_TRUST"; case PEP_STATEMACHINE_INVALID_STATE: return "PEP_STATEMACHINE_INVALID_STATE"; case PEP_STATEMACHINE_INVALID_EVENT: