Browse Source

...

generate_api
Volker Birk 4 years ago
parent
commit
b67cd478bf
10 changed files with 20 additions and 17 deletions
  1. +2
    -2
      src/Makefile
  2. +1
    -1
      src/pEp_internal.h
  3. +0
    -0
      src/sync_api.c
  4. +5
    -3
      src/sync_api.h
  5. +3
    -2
      sync/gen_statemachine.ysl2
  6. +1
    -1
      test/convenience_scripts/mime_decrypt.cc
  7. +1
    -1
      test/convenience_scripts/mime_encrypt_decrypt.cc
  8. +2
    -2
      test/pEpEngineTest.cc
  9. +1
    -1
      test/src/EngineTestSuite.cc
  10. +4
    -4
      test/src/util/test_util.cc

+ 2
- 2
src/Makefile View File

@ -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:


+ 1
- 1
src/pEp_internal.h View File

@ -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;


src/sync.c → src/sync_api.c View File


src/sync.h → src/sync_api.h View File


+ 3
- 2
sync/gen_statemachine.ysl2 View File

@ -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 <stdlib.h>
const char *«@name»_state_name(int state)
{


+ 1
- 1
test/convenience_scripts/mime_decrypt.cc View File

@ -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";


+ 1
- 1
test/convenience_scripts/mime_encrypt_decrypt.cc View File

@ -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";


+ 2
- 2
test/pEpEngineTest.cc View File

@ -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);


+ 1
- 1
test/src/EngineTestSuite.cc View File

@ -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";


+ 4
- 4
test/src/util/test_util.cc View File

@ -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:


Loading…
Cancel
Save