p≡p engine
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

151 lines
2.4 KiB

3 years ago
6 years ago
3 years ago
7 years ago
5 years ago
7 years ago
5 years ago
7 years ago
5 years ago
5 years ago
5 years ago
5 years ago
4 years ago
4 years ago
3 years ago
3 years ago
3 years ago
3 years ago
2 years ago
3 years ago
2 years ago
7 months ago
3 years ago
ENGINE-866 feature branch merge (squashed commit) of functionality to set the sticky bit for manually imported keys, to query for that bit in the trust database, and prevention of automatic reset of sticky keys by key reset when devices leave a device group. Squashed commit of the following: commit c64d850dc4bfe5a9dfd54aa94eea08a75ff69191 Author: Krista Bennett <krista@pep.foundation> Date: Fri Feb 26 15:29:32 2021 +0100 ENGINE-866: doc'd bit getter function commit ad725b5b7c742300a6a182ad8b058db23dbc3cfb Author: Krista Bennett <krista@pep.foundation> Date: Fri Feb 26 15:23:49 2021 +0100 ENGINE-866: Key reset tested on mixed sticky and not sticky keys and does what it should. commit 0ffbdde7b598c7c3fff5d797e732dec07685f9be Author: Krista Bennett <krista@pep.foundation> Date: Fri Feb 26 15:13:53 2021 +0100 ENGINE-866: Add boolean for whether to set the sticky bit or not with set_own_imported_key. the adapter should filter this out for apps, I guess, according to Volker commit 23fec59a9a4ede0682a9ebcb9a61e78456e7d8d4 Author: Krista Bennett <krista@pep.foundation> Date: Fri Feb 26 14:53:19 2021 +0100 ENGINE-866: Test and use the sticky bit commit 562239fda874623c40893c382a8f82df9e002ef5 Author: Krista Bennett <krista@pep.foundation> Date: Thu Feb 25 16:47:47 2021 +0100 ENGINE-866: moved bit from key to trust, created set_own_imported_key to replace set_own_key FOR MAIL APPS (does NOT replace it for key reset, as the new function can generate a passphrase error, whereas set_own_key cannot), and did an initial test to ensure the setter/getter functions work on the DB. commit 594133cfdee966adbaa66c62133ede1ca917bca0 Author: Krista Bennett <krista@pep.foundation> Date: Wed Feb 24 11:16:21 2021 +0100 Commented out the or'd identity.flags / pgp_keypair.flags in the sql code for the get_identity functions; we've never HAD a pgp_keypair flag before, so it never hurt before, but at this point, we're going to introduce them, and I don't want trouble. If fdik wants them or'd, fine, we'll have to change the values in the keyflags to be disjoint from the identity flags so they can coexist, but for now, they are out. commit 99831445b3e22e1386aa0f86414fdb6939e5ebaf Merge: 8ba53ece d1664cf5 Author: Krista Bennett <krista@pep.foundation> Date: Wed Feb 24 10:15:53 2021 +0100 Merge branch 'master' into ENGINE-866 commit 8ba53ece06773168a9188373d1be5f13d99b2f6e Merge: 168e2cf9 c52f4d39 Author: Krista Bennett <krista@pep.foundation> Date: Mon Feb 22 20:06:08 2021 +0100 Merged in engine_sql changes commit 168e2cf9578b12157b98da8b26e598f0a1448d9e Author: Krista Bennett <krista@pep.foundation> Date: Mon Feb 22 19:03:35 2021 +0100 ENGINE-866: Added sticky bit in database for manually set keys
8 months ago
7 months ago
  1. asn.1/Makefile.am.*
  2. asn.1/converter-example.mk
  3. asn.1/libasn1.a
  4. local.conf
  5. build/
  6. test_home/
  7. asn.1/*.c
  8. asn.1/*.h
  9. xcuserdata/
  10. *.orig
  11. *.old
  12. *.d
  13. *.d.*
  14. *.o
  15. *~
  16. *.swp
  17. db/*.csv
  18. db/*.db
  19. *.a
  20. *.dylib
  21. *.so
  22. test/pEpEngineTest
  23. *.exe
  24. Debug
  25. Release
  26. *.lib
  27. *.obj
  28. .DS_Store
  29. ws
  30. build-android/pEpEngine-android-1.zip
  31. build-android/third-party
  32. build-android/pEpEngine-android-1
  33. build-linux/*
  34. build-windows/libpEpasn1/libpEpasn1.vcxproj.user
  35. *.dSYM*
  36. *_test
  37. msg4.asc
  38. pep_Dokument_Titel.pdf
  39. pEpEngine.vcxproj.user
  40. Makefile.protocols
  41. test/msg_encrypt_for_self.asc
  42. tags
  43. asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj.user
  44. codegen/generated
  45. *.xml
  46. *.dot
  47. *.svg
  48. gpg-agent.conf
  49. gpg.conf
  50. pubring.gpg
  51. random_seed
  52. secring.gpg
  53. trustdb.gpg
  54. .pEp_management.db
  55. .cache
  56. __pycache__
  57. *.pyc
  58. test/gtest_parallel.py
  59. test/python_tests/test?
  60. test/python_tests/dummyhome?
  61. test/python_tests/common
  62. test/pEp_test_home
  63. test/TestDriver
  64. test/local
  65. test/include/LocalPlayground.h
  66. test/src/engine_test/LocalPlayground.cc
  67. .tags
  68. */.tags
  69. */*/.tags
  70. asn.1/.generated
  71. src/KeySync_*
  72. src/TrustSync_*
  73. src/GroupSync_*
  74. src/Sync_*
  75. src/sync_codec.*
  76. src/distribution_codec.*
  77. src/storage_codec.*
  78. asn.1/keysync.asn1
  79. asn.1/trustsync.asn1
  80. asn.1/groupsync.asn1
  81. asn.1/keyreset.asn1
  82. asn.1/sync.asn1
  83. asn.1/distribution.asn1
  84. asn.1/exploration.asn1
  85. asn.1/managedgroup.asn1
  86. asn.1/storage.asn1
  87. asn.1/messagestorage.asn1
  88. test/msg_2.0.asc
  89. test/*.txt
  90. lldb-history
  91. *.swo
  92. *.smp
  93. test/EngineTests
  94. test/googletest
  95. test/tmp/*
  96. src/commit_hash.h
  97. .idea/
  98. venv/
  99. venv2/
  100. cleangit.py
  101. newgit
  102. # Xcode related ignores
  103. build/
  104. DerivedData/
  105. *.pbxuser
  106. !default.pbxuser
  107. *.mode1v3
  108. !default.mode1v3
  109. *.mode2v3
  110. !default.mode2v3
  111. *.perspectivev3
  112. !default.perspectivev3
  113. xcuserdata/
  114. *.moved-aside
  115. *.xccheckout
  116. *.xcscmblueprint
  117. xcshareddata
  118. # ignore generated test data
  119. test/655_16F07F382FB3CF5DF977005D1069C7CACF9C23C6.asc
  120. test/655_5FBDE3C9E10552B1DD6D9763E89759391DE04053.asc
  121. test/655_EB4308E2D5B9FEEF7488D14CFEE4AE51914D566D.asc
  122. test/655_ECBA9555D9ADB1B68861B508032CCA777FFDBA14.asc
  123. test/655_decrypted_only.eml
  124. test/703_key_valid.asc
  125. test/test_keys/736_a.asc
  126. test/test_keys/736_b.asc
  127. test/test_mails/ENGINE-654_bob_mail.eml
  128. # ignore generated data
  129. codegen/generated/
  130. codegen/*.gen
  131. .copy
  132. # Don't remove these if you want to live a long life. It's necessary because it doesn't get cleaned up between branches.
  133. sync/generated
  134. sync/.codecs
  135. sync/.messages
  136. sync/.actions
  137. sync/.codegen
  138. sync/.statemachines
  139. sync/.copy
  140. *.ignore
  141. # Will remove once KER comes in
  142. test/test_mails/default_keys_test_*.eml