Commit Graph

4970 Commits (840fa041f333ad98ed5582806d0ff92e9c5bdbba)
 

Author SHA1 Message Date
Krista Bennett e217dc2392 ENGINE-951: refactored timegm_with_gmtoff to remove mem leak
2 years ago
Thomas 23810bd2b0 Update Windows projects and platform_windows.h
2 years ago
Krista Bennett 20d61f993b Trying to get merge/cherry-pick order between branches right - technically, changes should occur in Release branches as patches or in feature branches and then be merged into master. Patches merged/cherry-picked into master, and master should always be merged into development feature branches. Will need to document this better, but it starts with ensuring the version info is right in the right places.
2 years ago
Krista Bennett b6fc94660d Merge branch 'master' into Release_3.1
2 years ago
Krista Bennett 0948a3c4a2 ENGINE-952: ownership transfer instead of strdup
2 years ago
Krista Bennett d3a9bfe393 Merge branch 'master' into Release_3.1
2 years ago
Krista Bennett b5227e0451 ENGINE-796: updated sqlite3 amalgamation source. We really should automate this, but for other folks' future reference, all we do is download the amalgamation source (check hashes) and put sqlite3.c/h in here.
2 years ago
Krista Bennett af57bdb851 ENGINE-949: removed extraneous NULL check
2 years ago
Krista Bennett 01a2aea2c1 Merge branch 'master' into Release_3.1
2 years ago
Krista Bennett 9b5b9998fd ENGINE-948: NULL checks
2 years ago
Krista Bennett d631124d3a ENGINE-945: ENGINE-946: ENGINE-947: sql mem fixes and readability optimization for sqlite3_finalize
2 years ago
Krista Bennett f771f3170c Merge branch 'master' into Release_3.1
2 years ago
Krista Bennett da99a8dd14 Removed all MIME_encrypt/decrypt functions from tests and aux_mime_msg.* from the source. App builds may need to adjust!
2 years ago
Krista Bennett 90ec77a67c bumped patch num for next release
2 years ago
Krista Bennett c3773d1e15 Merge branch 'master' into Release_3.1
2 years ago
darthmama 747cb3b0a2 Merge pull request 'IOSAD-213 merge in Xcode related chagnes from Release_2.1' (#48) from buff/pEpEngine:master into master
2 years ago
Andreas Buff 28638831be IOSAD-213 merge in Xcode related chagnes from Release_2.1
2 years ago
Krista Bennett df0bc3f586 bumped patch num for next release
2 years ago
Krista Bennett a630672a51 Justus mem patches to sequoia driver
2 years ago
Krista Bennett dd3f226ed5 Merge branch 'master' into Release_3.1
2 years ago
Krista Bennett e45d51242d Fixed 2.1 legacy header issue
2 years ago
Krista Bennett 425b96b701 ENGINE-944: removed some dangerous string checking assumptions. Don't know if this is the cause of the issue, but it was still incorrect.
2 years ago
Krista Bennett 628d66710a ENGINE-935: added test (EncryptSignDirectLoopTest) which can be #if'd in to the test suite to check mem leaks on encrypt_and_sign
2 years ago
David Lanzendörfer 52d1bd13a5 NETPGP: Minor fixes
2 years ago
David Lanzendörfer a47996a60c Merge branch 'master' of https://gitea.pep.foundation/pEp.foundation/pEpEngine into zos_support2
2 years ago
darthmama fa91f0bd05 Merge pull request 'Adjust Windows build files and add necessary includes' (#46) from Thomas/pEpEngine:Release_3.1 into Release_3.1
2 years ago
Krista Bennett e6662ba2ea Bumped patch num for next release
2 years ago
Krista Bennett 03818ecec4 Merge branch 'master' into Release_3.1
2 years ago
Krista Bennett ab46b618fb ENGINE-936: renamed GroupCreate to GroupInvite
2 years ago
Krista Bennett 124181cfec Fixed tests which broke when we changed default min version.
2 years ago
Krista Bennett 0ddd929d8a ENGINE-938: Added notifyHandshake callback and status
2 years ago
Krista Bennett 9f9a73e9b4 bumped patch for next release
2 years ago
Krista Bennett 101d40207e ENGINE-939: If we're not going to import keys from 2.0 messages, we need to guarantee it's not the default setting anywhere for new pEp users. (This was changed as a last minute fix before KER was checked in and unfortunately didn't trigger test failures.)
2 years ago
Thomas 52de5a8e8d Adjust Windows build files and add necessary includes
2 years ago
Krista Bennett cfba0ed0c9 Bumped patch for next release
2 years ago
Krista Bennett 4841a14a5d Added non-matching 2.2 claim case
2 years ago
Krista Bennett 663b3a4237 Added trusted and reliable cases to ensure keys don't get clobbered
2 years ago
Krista Bennett 8bd0617b74 ENGINE-920: oops, || vs. &&
2 years ago
Krista Bennett bf16e3081a ENGINE-920: compare undashed utf8
2 years ago
Krista Bennett 50791d7c39 Forgot to increase actual DDL version
2 years ago
Krista Bennett d6231e183d ENGINE-633: test fixes - in she goes.
2 years ago
Krista Bennett 28637f77fa ENGINE-633: fixed broken one-file requirement (refactor mistake), ENGINE-811: remove blacklist.h from makefile
2 years ago
Krista Bennett bb3b817d3e ENGINE-633: test cleanup and fixes (more to come)
2 years ago
Krista Bennett 7fa5958e15 ENGINE-633: some non-pEp mail tests added
2 years ago
Krista Bennett b176506d3e ENGINE-811: Removed blacklisting. Tables won't be removed, but all statements and functions accessing them are now gone.
2 years ago
Krista Bennett efde49fb78 ENGINE-828: removed username from matching heuristics in update_identity
2 years ago
Krista Bennett 6e055fc73b commit to transfer to other machine - in the middle of removing username checks on update_identity
2 years ago
Krista Bennett 70e288cd62 Merge branch 'master' into ENGINE-633
2 years ago
Krista Bennett bbc31bf6d8 Changed From_M2_1.eml to reflect 2.1.34+ filename change
2 years ago
Krista Bennett 45b1aeff81 ENGINE-633: expected failure cases due to 2.0 changes now fail appropriately
2 years ago