Ok, so I horked the ENGINE-450 branch through a misunderstanding of strip and a lazy mistake. Recomposing here. ENGINE-450-MARK-II
authorKrista Bennett <krista@pep-project.org>
Tue, 31 Jul 2018 11:08:43 +0200
branchENGINE-450-MARK-II
changeset 2792bc4b1dff3fdb
parent 2789 038c70f9f5ce
child 2793 2f50ad059072
Ok, so I horked the ENGINE-450 branch through a misunderstanding of strip and a lazy mistake. Recomposing here.
src/pEp_internal.h
src/pgp_gpg.c
     1.1 --- a/src/pEp_internal.h	Mon Jul 30 19:38:45 2018 +0200
     1.2 +++ b/src/pEp_internal.h	Tue Jul 31 11:08:43 2018 +0200
     1.3 @@ -3,10 +3,10 @@
     1.4  
     1.5  
     1.6  // THESE MUST ALL BE CHANGED TOGETHER!!!!
     1.7 -#define PEP_ENGINE_VERSION "1.0.440"
     1.8 +#define PEP_ENGINE_VERSION "1.0.441"
     1.9  #define PEP_ENGINE_MAJOR 1
    1.10  #define PEP_ENGINE_MINOR 0
    1.11 -#define PEP_ENGINE_PATCH 440
    1.12 +#define PEP_ENGINE_PATCH 441
    1.13  
    1.14  // maximum attachment size to import as key 1MB, maximum of 20 attachments
    1.15  
     2.1 --- a/src/pgp_gpg.c	Mon Jul 30 19:38:45 2018 +0200
     2.2 +++ b/src/pgp_gpg.c	Tue Jul 31 11:08:43 2018 +0200
     2.3 @@ -497,7 +497,7 @@
     2.4          int compare_result = -1;
     2.5          status = compare_cached_engine_version_to_other(session,
     2.6                                                          &compare_result, 
     2.7 -                                                        1, 0, 440);            
     2.8 +                                                        1, 0, 441);            
     2.9  
    2.10          bResult = true;
    2.11          // status != OK => no cached engine version, i.e. first-time run.
    2.12 @@ -528,11 +528,16 @@
    2.13          stringlist_add(conf_keys, "max-cache-ttl");
    2.14          stringlist_add(conf_values, "1200");
    2.15  
    2.16 +        if (compare_result < 0 && status == PEP_STATUS_OK)
    2.17  #if defined(WIN32) || defined(NDEBUG)
    2.18 -        bResult = ensure_config_values(conf_keys, conf_values, gpg_agent_conf());
    2.19 -#else        
    2.20 -        bResult = ensure_config_values(conf_keys, conf_values, gpg_agent_conf(false));
    2.21 -#endif
    2.22 +            bResult = quickfix_config(conf_keys, gpg_agent_conf());
    2.23 +        if (bResult)
    2.24 +            bResult = ensure_config_values(conf_keys, conf_values, gpg_agent_conf());
    2.25 + #else        
    2.26 +            bResult = quickfix_config(conf_keys, gpg_agent_conf(false));
    2.27 +        if (bResult)
    2.28 +            bResult = ensure_config_values(conf_keys, conf_values, gpg_agent_conf(false));
    2.29 + #endif
    2.30          free_stringlist(conf_keys);
    2.31          free_stringlist(conf_values);
    2.32