merged in default import_priv_keys_fix
authorKrista Bennett <krista@pep-project.org>
Tue, 21 Nov 2017 18:10:50 +0100
branchimport_priv_keys_fix
changeset 2291322669cc0ec6
parent 2290 1cc3770407e0
parent 2286 15e51d4abd15
child 2292 61a4c53de0d6
child 2717 3666c88620d4
merged in default
     1.1 --- a/.hgtags	Tue Nov 21 18:10:20 2017 +0100
     1.2 +++ b/.hgtags	Tue Nov 21 18:10:50 2017 +0100
     1.3 @@ -3,3 +3,4 @@
     1.4  2b4d6c760ad771d9917cd6f0f96c4ab379d75d1d 0.7.0
     1.5  a1ba15c1ac041c780e52e759db6b77d116f29c72 0.8.0
     1.6  3efe9ded2561d3f6d406acbcbcee01b823cb4de8 for_Outlook-1.1.10
     1.7 +fa00137505b8528c77efe8df40963f5fef452cad 0.9.0 release
     2.1 --- a/src/pEp_internal.h	Tue Nov 21 18:10:20 2017 +0100
     2.2 +++ b/src/pEp_internal.h	Tue Nov 21 18:10:50 2017 +0100
     2.3 @@ -359,10 +359,14 @@
     2.4  
     2.5  // This is just a horrible example of C type madness. UTF-8 made me do it.
     2.6  static inline char* _pep_subj_copy() {
     2.7 +#ifndef WIN32
     2.8      unsigned char pepstr[] = PEP_SUBJ_STRING;
     2.9      void* retval = calloc(1, sizeof(unsigned char)*PEP_SUBJ_BYTELEN + 1);
    2.10      memcpy(retval, pepstr, PEP_SUBJ_BYTELEN);
    2.11      return (char*)retval;
    2.12 +#else
    2.13 +    return strdup("pEp");
    2.14 +#endif
    2.15  }
    2.16  
    2.17  // These are globals used in generating message IDs and should only be