merged ENGINE-79 with default
authorKrista Grothoff <krista@pep-project.org>
Mon, 15 Aug 2016 14:23:13 +0200
changeset 10136bfa7a6a2c0f
parent 999 2c9ed75a67af
parent 1012 68ad42cc75a5
child 1014 bcae7f935d40
child 1017 555d74646dbf
child 1024 fc8ac1e60c3c
child 1027 ad235776cf40
child 1034 1ec3384548cb
merged ENGINE-79 with default
     1.1 --- a/src/pEpEngine.c	Wed Aug 10 16:02:01 2016 +0200
     1.2 +++ b/src/pEpEngine.c	Mon Aug 15 14:23:13 2016 +0200
     1.3 @@ -1745,6 +1745,11 @@
     1.4      return status;
     1.5  }
     1.6  
     1.7 +DYNAMIC_API const char* get_engine_version() {
     1.8 +    return PEP_ENGINE_VERSION;
     1.9 +}
    1.10 +
    1.11 +
    1.12  DYNAMIC_API PEP_STATUS reset_peptest_hack(PEP_SESSION session)
    1.13  {
    1.14      assert(session);
     2.1 --- a/src/pEpEngine.h	Wed Aug 10 16:02:01 2016 +0200
     2.2 +++ b/src/pEpEngine.h	Mon Aug 15 14:23:13 2016 +0200
     2.3 @@ -884,6 +884,15 @@
     2.4      );
     2.5  
     2.6  
     2.7 +// get_engine_version() - returns the current version of pEpEngine (this is different
     2.8 +//                        from the pEp protocol version!)
     2.9 +//
    2.10 +//  parameters: none
    2.11 +//
    2.12 +//  return_value: const char* to the engine version string constant
    2.13 +//
    2.14 +DYNAMIC_API const char* get_engine_version();
    2.15 +
    2.16  DYNAMIC_API PEP_STATUS reset_peptest_hack(PEP_SESSION session);
    2.17  
    2.18  #ifdef __cplusplus
     3.1 --- a/test/pEpEngineTest.cc	Wed Aug 10 16:02:01 2016 +0200
     3.2 +++ b/test/pEpEngineTest.cc	Mon Aug 15 14:23:13 2016 +0200
     3.3 @@ -285,6 +285,8 @@
     3.4      assert(tcomm_type == PEP_ct_OpenPGP_unconfirmed);
     3.5      
     3.6      cout << "\ncalling release()\n";
     3.7 +    cout << endl << "End of pEpEngineTest for engine version " << get_engine_version() << endl;
     3.8 +
     3.9      release(session);
    3.10      return 0;
    3.11  }