Commit Graph

  • 20d61f99 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. by Krista Bennett 2021-07-14 11:09:26 +0200
  • b6fc9466 Merge branch 'master' into Release_3.1 by Krista Bennett 2021-07-14 10:38:42 +0200
  • 0948a3c4 ENGINE-952: ownership transfer instead of strdup by Krista Bennett 2021-07-14 10:35:35 +0200
  • d3a9bfe3 Merge branch 'master' into Release_3.1 by Krista Bennett 2021-07-14 10:26:27 +0200
  • b5227e04 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. by Krista Bennett 2021-07-14 10:20:38 +0200
  • af57bdb8 ENGINE-949: removed extraneous NULL check by Krista Bennett 2021-07-14 10:04:44 +0200
  • 01a2aea2 Merge branch 'master' into Release_3.1 by Krista Bennett 2021-07-14 09:57:41 +0200
  • 9b5b9998 ENGINE-948: NULL checks by Krista Bennett 2021-07-13 15:34:14 +0200
  • d631124d ENGINE-945: ENGINE-946: ENGINE-947: sql mem fixes and readability optimization for sqlite3_finalize by Krista Bennett 2021-07-14 09:54:52 +0200
  • f771f317 Merge branch 'master' into Release_3.1 by Krista Bennett 2021-07-13 14:57:35 +0200
  • da99a8dd Removed all MIME_encrypt/decrypt functions from tests and aux_mime_msg.* from the source. App builds may need to adjust! by Krista Bennett 2021-07-13 14:57:02 +0200
  • 90ec77a6 bumped patch num for next release by Krista Bennett 2021-07-12 16:03:11 +0200
  • c3773d1e (tag: Release_3.1.4) Merge branch 'master' into Release_3.1 by Krista Bennett 2021-07-12 16:02:04 +0200
  • 747cb3b0 Merge pull request 'IOSAD-213 merge in Xcode related chagnes from Release_2.1' (#48) from buff/pEpEngine:master into master by darthmama 2021-07-12 15:58:27 +0200
  • 28638831 IOSAD-213 merge in Xcode related chagnes from Release_2.1 by Andreas Buff 2021-07-12 15:53:37 +0200
  • df0bc3f5 bumped patch num for next release by Krista Bennett 2021-07-12 12:50:09 +0200
  • a630672a (tag: Release_3.1.3) Justus mem patches to sequoia driver by Krista Bennett 2021-07-12 12:45:43 +0200
  • dd3f226e Merge branch 'master' into Release_3.1 by Krista Bennett 2021-07-12 11:44:08 +0200
  • e45d5124 Fixed 2.1 legacy header issue by Krista Bennett 2021-07-12 11:43:59 +0200
  • 425b96b7 ENGINE-944: removed some dangerous string checking assumptions. Don't know if this is the cause of the issue, but it was still incorrect. by Krista Bennett 2021-07-12 11:06:35 +0200
  • 628d6671 ENGINE-935: added test (EncryptSignDirectLoopTest) which can be #if'd in to the test suite to check mem leaks on encrypt_and_sign by Krista Bennett 2021-06-28 08:22:12 +0200
  • 52d1bd13 NETPGP: Minor fixes by David Lanzendörfer 2021-07-09 19:32:03 +0100
  • a47996a6 Merge branch 'master' of https://gitea.pep.foundation/pEp.foundation/pEpEngine into zos_support2 by David Lanzendörfer 2021-06-30 01:53:47 +0100
  • fa91f0bd Merge pull request 'Adjust Windows build files and add necessary includes' (#46) from Thomas/pEpEngine:Release_3.1 into Release_3.1 by darthmama 2021-06-28 12:18:40 +0200
  • e6662ba2 Bumped patch num for next release by Krista Bennett 2021-06-27 22:30:08 +0200
  • 03818ece (tag: Release_3.1.2) Merge branch 'master' into Release_3.1 by Krista Bennett 2021-06-27 22:27:06 +0200
  • ab46b618 ENGINE-936: renamed GroupCreate to GroupInvite by Krista Bennett 2021-06-27 22:25:32 +0200
  • 124181cf Fixed tests which broke when we changed default min version. by Krista Bennett 2021-06-27 22:09:49 +0200
  • 0ddd929d ENGINE-938: Added notifyHandshake callback and status by Krista Bennett 2021-06-27 22:03:41 +0200
  • 9f9a73e9 bumped patch for next release by Krista Bennett 2021-06-25 22:26:56 +0200
  • 101d4020 (tag: Release_3.1.1) 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.) by Krista Bennett 2021-06-25 22:24:45 +0200
  • 52de5a8e Adjust Windows build files and add necessary includes by Thomas 2021-06-23 15:15:36 +0200
  • cfba0ed0 Bumped patch for next release by Krista Bennett 2021-06-23 12:12:10 +0200
  • 4841a14a (tag: Release_3.1.0) Added non-matching 2.2 claim case by Krista Bennett 2021-06-21 18:53:51 +0200
  • 663b3a42 Added trusted and reliable cases to ensure keys don't get clobbered by Krista Bennett 2021-06-21 17:36:43 +0200
  • 8bd0617b ENGINE-920: oops, || vs. && by Krista Bennett 2021-06-21 15:13:17 +0200
  • bf16e308 ENGINE-920: compare undashed utf8 by Krista Bennett 2021-06-21 13:05:57 +0200
  • 50791d7c Forgot to increase actual DDL version by Krista Bennett 2021-06-20 15:12:10 +0200
  • d6231e18 (tag: archive/ENGINE-633) ENGINE-633: test fixes - in she goes. by Krista Bennett 2021-06-20 12:50:50 +0200
  • 28637f77 ENGINE-633: fixed broken one-file requirement (refactor mistake), ENGINE-811: remove blacklist.h from makefile by Krista Bennett 2021-06-18 17:52:10 +0200
  • bb3b817d ENGINE-633: test cleanup and fixes (more to come) by Krista Bennett 2021-06-18 14:42:35 +0200
  • 7fa5958e ENGINE-633: some non-pEp mail tests added by Krista Bennett 2021-06-18 14:38:22 +0200
  • b176506d ENGINE-811: Removed blacklisting. Tables won't be removed, but all statements and functions accessing them are now gone. by Krista Bennett 2021-06-18 13:43:08 +0200
  • efde49fb ENGINE-828: removed username from matching heuristics in update_identity by Krista Bennett 2021-06-18 13:08:52 +0200
  • 6e055fc7 commit to transfer to other machine - in the middle of removing username checks on update_identity by Krista Bennett 2021-06-18 10:30:16 +0200
  • 70e288cd Merge branch 'master' into ENGINE-633 by Krista Bennett 2021-06-17 14:31:16 +0200
  • bbc31bf6 Changed From_M2_1.eml to reflect 2.1.34+ filename change by Krista Bennett 2021-06-17 14:30:18 +0200
  • 45b1aeff ENGINE-633: expected failure cases due to 2.0 changes now fail appropriately by Krista Bennett 2021-06-17 13:50:57 +0200
  • f48f1feb New pEp version by Krista Bennett 2021-06-17 13:40:28 +0200
  • ee3320ee Merge branch 'master' into ENGINE-633 by Krista Bennett 2021-06-17 13:24:41 +0200
  • 7ff52c78 ENGINE-931: fix for 2.1.27+ issue uncovered in PYADPT-124 (replacement for other cases will come with ENGINE-932) by Krista Bennett 2021-06-17 13:15:59 +0200
  • 8bdbe866 Merge branch 'master' into ENGINE-633 by Krista Bennett 2021-06-16 17:00:53 +0200
  • 635e7959 ENGINE-633: Fixed refactored and fixed setting of default keys. Several 2.0 cases fail, as intended, as we won't support those anymore. The tests need to be updated now, and then maybe we're in business. by Krista Bennett 2021-06-16 16:45:12 +0200
  • c940a8c1 Merge pull request 'MACOSINST-26 take over build-mac related changes from Release_2.1' (#43) from buff/pEpEngine:master into master by darthmama 2021-06-16 10:31:16 +0200
  • 176c57cd MACOSINST-26 take over build-mac related changes from Release_2.1 by Andreas Buff 2021-06-16 10:27:49 +0200
  • e856ec80 Merge branch 'ENGINE-633' of https://gitea.pep.foundation/darthmama/pEpEngine into ENGINE-633 by Krista Bennett 2021-06-15 16:32:16 +0200
  • bfd4713d sample target code by Volker Birk 2021-06-15 15:30:47 +0200
  • 2cd53655 publish import_key_with_fpr_return() by Volker Birk 2021-06-14 21:55:48 +0200
  • 5f5d1f7b ENGINE-633: Force DB upgrade to message version 2.1 for all pEp partners and 2.2 for all non-group own identities by Krista Bennett 2021-06-14 14:14:27 +0200
  • fb39ee55 Merge branch 'master' into ENGINE-633 by Krista Bennett 2021-06-11 12:30:12 +0200
  • f1b6dd8c update to Sequoia openpgp/v1.3.0 by Volker Birk 2021-06-10 17:51:11 +0200
  • 5a770088 ENGINE-633: converted upstream test cases - those that fail I expect to fail right now because we're fixing the spec by Krista Bennett 2021-06-10 15:01:18 +0200
  • 182c7572 Merge branch 'ENGINE-633' of https://gitea.pep.foundation/pEp.foundation/pEpEngine into ENGINE-633 by Krista Bennett 2021-06-10 14:34:48 +0200
  • bbfc9f33 Committing to merge by Krista Bennett 2021-06-10 13:53:18 +0200
  • c816b8f3 ENGINE-633: massive test refactor by Krista Bennett 2021-06-10 11:39:17 +0200
  • 1728de49 Refactored default mail generation to make it more maintainable by Krista Bennett 2021-06-07 15:45:06 +0200
  • 6a5f2704 ENGINE-633: shut define off by Krista Bennett 2021-06-07 12:43:54 +0200
  • 7e93106b ENGINE-633: test email generation fixes and additional test cases by Krista Bennett 2021-06-07 10:34:23 +0200
  • 9f1324bf ENGINE-633: default key import tests evolution by Krista Bennett 2021-06-06 15:49:50 +0200
  • dfb08ebc z/OS support: Fix compilation errors by David Lanzendörfer 2021-06-05 04:17:48 +0100
  • c88bd9c4 z/OS support: Cleaning up by David Lanzendörfer 2021-06-05 04:16:26 +0100
  • d1d2f5ca z/OS support: No threads for now by David Lanzendörfer 2021-06-05 04:15:16 +0100
  • c48f1ad0 z/OS support: Make env by David Lanzendörfer 2021-06-05 04:13:53 +0100
  • a430fdd6 z/OS: support fix linking by David Lanzendörfer 2021-06-05 04:12:50 +0100
  • 0bbb43df Downgraded the C++17 inline var to an acceptable C++14 equivalent by Krista Bennett 2021-06-04 19:47:25 +0200
  • 15c7ec7b z/OS support: fix isspace issue by David Lanzendörfer 2021-06-04 18:01:56 +0100
  • 59b3d168 A whole bunch of canonical emails generated with various target pEp versions and open PGP - intentionally broken files are in *wrong*.eml by Krista Bennett 2021-06-03 20:55:13 +0200
  • 52ddb9d3 Probably committing a whole lot of C++ sins, but preset was bugging me. Still not sure about that inline static object array. Will fix later. by Krista Bennett 2021-06-03 16:57:47 +0200
  • 46c2df47 Refactored test_utils name. by Krista Bennett 2021-06-03 14:46:31 +0200
  • 4db5c9df Tests: make setting fpr an explicit choice for the new world order in preset-world by Krista Bennett 2021-06-03 14:29:18 +0200
  • 7ee519f4 ENGINE-928: fixed test assumptions by Krista Bennett 2021-06-03 12:37:26 +0200
  • c0d97044 ENGINE-928: Ported set_comm_partner_key() from Release_2.1 by Krista Bennett 2021-06-03 12:04:55 +0200
  • ab3a47cb Return list end as intended in stringlist_get_tail (oops, thanks Roker for the catch by Krista Bennett 2021-06-01 07:34:31 +0200
  • 9033abdf ENGINE-633: Need to commit rather than stash for reasons. Commit may not compile. Changes are on the UpdateID tests, which need a full overhaul. by Krista Bennett 2021-06-02 15:40:25 +0200
  • b1a6e790 z/OS: Support by David Lanzendörfer 2021-02-01 00:31:07 +0000
  • 026cf763 z/OS support: Adding missing functions for z/OS by David Lanzendörfer 2021-01-18 21:07:23 +0000
  • de2ef305 z/OS support: Introducing OS/390 detection by David Lanzendörfer 2021-01-18 19:34:35 +0000
  • 484897a1 Merge branch 'master' into generate_api by Nana 2021-05-21 11:49:22 +0200
  • 5a5dc6f9 ENGINE-633: Update identity test: fixed test assumptions (set key, group 1: PEP_KEY_UNSUITABLE -> PEP_STATUS_OK) by Krista Bennett 2021-05-19 21:39:48 +0200
  • f7764a1a ENGINE-633: Fixed old message api test assumptions by Krista Bennett 2021-05-19 19:59:52 +0200
  • bfdf72e8 ENGINE-633: Default from tests fixed as far as they go (they were clearly left incomplete, so that's next on TODO) by Krista Bennett 2021-05-19 19:32:00 +0200
  • d92c94f1 ENGINE-633: fixed test assumptions - Message2_1Test by Krista Bennett 2021-05-19 13:18:21 +0200
  • db75524d ENGINE-633: fixed test assumptions - MessageTwoPointOhTest by Krista Bennett 2021-05-19 13:10:36 +0200
  • 57c5cac4 ENGINE-633: fixed default setting of header keys in OpenPGP messages by Krista Bennett 2021-05-19 12:53:47 +0200
  • 2ce7baab ENGINE-633: Fixed error with update_identity - now, if a default key is unsuitable and there is no other available key in the trust db (meaning it's been assigned as a default at some time) for this identity, we return no key, PEP_ct_key_not_found, and PEP_STATUS_OK, *not* PEP_KEY_UNSUITABLE, since there is no key returned. key-related functions will still return that status. by Krista Bennett 2021-05-19 12:02:44 +0200
  • a4594a7f CI: share build scripts between distros by Devan Carpenter 2021-05-18 17:11:36 -0700
  • de876f5f ENGINE-633: fixed some clear bugs not in the master branch. I don't even wanna know - likely from my initial pass where I thought these were inevitable effects of key election removal. Now fixed with expected behaviours by Krista Bennett 2021-05-17 19:41:06 +0200
  • fc0376f3 ENGINE-633: ElevatedAttachmentsTest update_identity assumption fixed by Krista Bennett 2021-05-17 19:12:13 +0200
  • ee7e277f ENGINE-633: Engine704Test update_identity assumption fixed by Krista Bennett 2021-05-17 19:08:49 +0200
  • 00070534 ENGINE-633: correct update_identity assumptions in RevokeRegenAttachTest - TODO: someone come back and check on this, because I think it's leftovers from the before-key-reset days by Krista Bennett 2021-05-17 18:52:55 +0200