update NFC data from Unicode 13.0.0 to Unicode 14.0.0.

README.md

@@ -18,6 +18,7 @@ supported, Windows is about to follow.  Newer versions should also work
 * libboost-program-options-dev 
 * libboost-filesystem-dev
 * [p≡p Engine](https://gitea.pep.foundation/pEp.foundation/pEpEngine/)
+  p≡p Engine Version Release_3.1
   (which needs sequoia, a patched libetpan, libboost-system-dev)
 * [libpEpAdapter](https://gitea.pep.foundation/pEp.foundation/libpEpAdapter/)
 * [webserver](https://gitea.pep.foundation/fdik/webserver)

server/ev_server.cc

@@ -12,7 +12,6 @@
 #include "server_version.hh"
 
 #include <pEp/message_api.h>
-#include <pEp/blacklist.h>
 #include <pEp/key_reset.h>
 #include <pEp/openpgp_compat.h>
 #include <pEp/message_api.h> // for get_binary_path()
@@ -23,6 +22,7 @@
 #include <pEp/status_to_string.hh>
 #include <pEp/slurp.hh>
 #include <pEp/message_cache.hh>
+#include <pEp/group_manager_api.h> // Yes, .h because it is a C API in libpEpAdapter!
 
 #include <boost/filesystem.hpp>
 #include "json_spirit/json_spirit_reader.h"
@@ -185,11 +185,7 @@ const FunctionMap functions = {
 		FP( "revoke"        , new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>, In<c_string>> ( &revoke_key) ),
 		FP( "key_expired"   , new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>, In<time_t>, Out<bool>> ( &key_expired) ),
 		
-		FP( "from blacklist.h & OpenPGP_compat.h", new Separator),
-		FP( "blacklist_add"   , new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>> ( &blacklist_add) ),
-		FP( "blacklist_delete", new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>> ( &blacklist_delete) ),
-		FP( "blacklist_is_listed", new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>, Out<bool>> ( &blacklist_is_listed) ),
-		FP( "blacklist_retrieve" , new FuncPC<PEP_STATUS, In_Pep_Session, Out<stringlist_t*>> ( &blacklist_retrieve) ),
+		FP( "from openpgp_compat.h", new Separator),
 		FP( "OpenPGP_list_keyinfo", new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>, Out<stringpair_list_t*>> ( &OpenPGP_list_keyinfo) ),
 		
 		FP( "Event Listener & Results", new Separator ),
@@ -206,13 +202,23 @@ const FunctionMap functions = {
 		FP( "enable_identity_for_sync" , new FuncPC<PEP_STATUS, In_Pep_Session, InOut<pEp_identity*>> (&enable_identity_for_sync)),
 		FP( "disable_identity_for_sync", new FuncPC<PEP_STATUS, In_Pep_Session, InOut<pEp_identity*>> (&disable_identity_for_sync)),
 		FP( "disable_all_sync_channels", new Func<PEP_STATUS, In_Pep_Session> (&disable_all_sync_channels)),
+		
+		FP( "Group Manager API", new Separator),
+		FP( "adapter_group_create"       , new Func<PEP_STATUS, In_Pep_Session, InOut<pEp_identity*>, InOut<pEp_identity*>, InOut<identity_list*>> (&adapter_group_create)),
+		FP( "adapter_group_dissolve"     , new Func<PEP_STATUS, In_Pep_Session, In<pEp_identity*>, In<pEp_identity*>> (&adapter_group_dissolve)),
+		FP( "adapter_group_invite_member", new Func<PEP_STATUS, In_Pep_Session, In<pEp_identity*>, In<pEp_identity*>> (&adapter_group_invite_member)),
+		FP( "adapter_group_remove_member", new Func<PEP_STATUS, In_Pep_Session, In<pEp_identity*>, In<pEp_identity*>> (&adapter_group_remove_member)),
+		FP( "adapter_group_join"         , new Func<PEP_STATUS, In_Pep_Session, In<pEp_identity*>, In<pEp_identity*>> (&adapter_group_join)),
+		FP( "adapter_group_query_groups" , new Func<PEP_STATUS, In_Pep_Session, Out<identity_list*>> (&adapter_group_query_groups)),
+		FP( "adapter_group_query_manager", new Func<PEP_STATUS, In_Pep_Session, In<const pEp_identity*>, Out<pEp_identity*>> (&adapter_group_query_manager)),
+		FP( "adapter_group_query_members", new Func<PEP_STATUS, In_Pep_Session, In<const pEp_identity*>, Out<identity_list*>> (&adapter_group_query_members)),
 
 #ifndef JSON_ADAPTER_LIBRARY
 		FP( "startSync", new Func<void> (&pEp::mini::startSync) ),
 		FP( "stopSync" , new Func<void> (&pEp::mini::stopSync) ),
 #else
-		FP( "startSync", new Func<void> (&pEp::CallbackDispatcher::start_sync) ),
-		FP( "stopSync" , new Func<void> (&pEp::CallbackDispatcher::stop_sync) ),
+		FP( "startSync", new Func<void> (&pEp::Adapter::start_sync) ),
+		FP( "stopSync" , new Func<void> (&pEp::Adapter::stop_sync) ),
 #endif
 		// my own example function that does something useful. :-)
 		FP( "Other", new Separator ),
@@ -419,5 +425,5 @@ void ev_server::thread_init()
 void ev_server::thread_done()
 {
 	JsonAdapter::getInstance().connection_close_cb();
-	pEp::Adapter::session(pEp::Adapter::release);
+	pEp::Adapter::session.release();
 }

server/mini-adapter-impl.cc

@@ -36,13 +36,13 @@ namespace mini {
 
 void startSync()
 {
-    pEp::callback_dispatcher.start_sync();
+    pEp::Adapter::start_sync();
 }
 
 
 void stopSync()
 {
-	pEp::callback_dispatcher.stop_sync();
+	pEp::Adapter::stop_sync();
 }
 
 

server/nfc_sets.cc

@@ -416,6 +416,23 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
 	{0x0859, 220},
 	{0x085A, 220},
 	{0x085B, 220},
+	{0x0898, 230},
+	{0x0899, 220},
+	{0x089A, 220},
+	{0x089B, 220},
+	{0x089C, 230},
+	{0x089D, 230},
+	{0x089E, 230},
+	{0x089F, 230},
+	{0x08CA, 230},
+	{0x08CB, 230},
+	{0x08CC, 230},
+	{0x08CD, 230},
+	{0x08CE, 230},
+	{0x08CF, 220},
+	{0x08D0, 220},
+	{0x08D1, 220},
+	{0x08D2, 220},
 	{0x08D3, 220},
 	{0x08D4, 230},
 	{0x08D5, 230},
@@ -476,6 +493,7 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
 	{0x0B3C, 7},
 	{0x0B4D, 9},
 	{0x0BCD, 9},
+	{0x0C3C, 7},
 	{0x0C4D, 9},
 	{0x0C55, 84},
 	{0x0C56, 91},
@@ -526,6 +544,7 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
 	{0x135E, 230},
 	{0x135F, 230},
 	{0x1714, 9},
+	{0x1715, 9},
 	{0x1734, 9},
 	{0x17D2, 9},
 	{0x17DD, 230},
@@ -561,6 +580,20 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
 	{0x1ABD, 220},
 	{0x1ABF, 220},
 	{0x1AC0, 220},
+	{0x1AC1, 230},
+	{0x1AC2, 230},
+	{0x1AC3, 220},
+	{0x1AC4, 220},
+	{0x1AC5, 230},
+	{0x1AC6, 230},
+	{0x1AC7, 230},
+	{0x1AC8, 230},
+	{0x1AC9, 230},
+	{0x1ACA, 220},
+	{0x1ACB, 230},
+	{0x1ACC, 230},
+	{0x1ACD, 230},
+	{0x1ACE, 230},
 	{0x1B34, 7},
 	{0x1B44, 9},
 	{0x1B6B, 230},
@@ -663,6 +696,7 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
 	{0x1DF7, 228},
 	{0x1DF8, 228},
 	{0x1DF9, 220},
+	{0x1DFA, 218},
 	{0x1DFB, 230},
 	{0x1DFC, 233},
 	{0x1DFD, 220},
@@ -840,7 +874,12 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
 	{0x10F4E, 220},
 	{0x10F4F, 220},
 	{0x10F50, 220},
+	{0x10F82, 230},
+	{0x10F83, 220},
+	{0x10F84, 230},
+	{0x10F85, 220},
 	{0x11046, 9},
+	{0x11070, 9},
 	{0x1107F, 9},
 	{0x110B9, 9},
 	{0x110BA, 7},
@@ -989,6 +1028,7 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
 	{0x1E134, 230},
 	{0x1E135, 230},
 	{0x1E136, 230},
+	{0x1E2AE, 230},
 	{0x1E2EC, 230},
 	{0x1E2ED, 230},
 	{0x1E2EE, 230},

server/pEp-types.cc

@@ -102,6 +102,12 @@ Out<identity_list*>::~Out()
 	value=nullptr;
 }
 
+template<>
+In<identity_list*>::~In()
+{
+	free_identity_list(value);
+}
+
 template<>
 In<const identity_list*>::~In()
 {

server/server_version.cc

@@ -80,7 +80,13 @@ static const std::string VersionName =
 //	"(46) Erfurt-West";  // JSON-156: delete client cached values after timeout.
 //	"(47a) Erfurt-Ost";  // JSON-160, JSON-172, JSON-179.
 //	"(47b) Erfurt-Vieselbach"; // JSON-183: "Provide an API for pEp4Tb to communicate whether the message subject should be hidden (replaced with pEp)"
-	"(48) Nohra"; // FPMAIL-412, P4TB-400: add import_key_with_fpr_return()
+//	"(48) Nohra"; // FPMAIL-412, P4TB-400: add import_key_with_fpr_return()
+
+//////////////////////
+// 49...55 are skipped for futher Releases of the 2.1 branch, if necessary.
+//////////////////////
+
+	"(56a) Hermsdorfer Kreuz"; // JSON-197: Group Encryption, Engine 3.1 branch.
 	
 } // end of anonymous namespace
 ////////////////////////////////////////////////////////////////////////////
@@ -121,7 +127,13 @@ const ServerVersion& server_version()
 //static const ServerVersion sv(0,22,0); // JSON-183 "Provide an API for pEp4Tb to communicate whether the message subject should be hidden (replaced with pEp)"
 //static const ServerVersion sv(0,22,1); // ENGINE-890: add disable_all_sync_channels()
 //static const ServerVersion sv(0,22,2);   // JSON-194: add set_comm_partner_key()
-static const ServerVersion sv(0,22,3);   // FPMAIL-412, P4TB-400: add import_key_with_fpr_return()
+//static const ServerVersion sv(0,22,3);   // FPMAIL-412, P4TB-400: add import_key_with_fpr_return()
+
+////////////////////////
+// Intentional big jump, because Group Encryption is a major step, worth starting with >0 SemVer versions, I think.
+////////////////////////
+
+	static const ServerVersion sv(3,1,0);  // JSON-197: Group Encryption. 3.1 branch of Engine & JSON Adapter
 	return sv;
 }