pEp.foundation
/
pEpJSONServerAdapter
10
2
Fork 4
Code Issues 1 Pull Requests Releases 1 Wiki Activity

FPMAIL-412, P4TB-400: add import_key_with_fpr_return().

pull/2/head^2 Release_2.1.3
roker 2021-06-15 10:55:07 +02:00
parent cb7f81a537
commit f5bf4fd495
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/ev_server.cc
View File

@ -160,6 +160,7 @@ const FunctionMap functions = {
FP( "generate_keypair", new FuncPC<PEP_STATUS, In_Pep_Session, InOut<pEp_identity*>> ( &generate_keypair) ),
FP( "delete_keypair", new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>> ( &delete_keypair) ),
FP( "import_key" , new FuncPC<PEP_STATUS, In_Pep_Session, In<binary_string>, InLength<>, Out<identity_list*>> ( &import_key) ),
FP( "import_key_with_fpr_return", new FuncPC<PEP_STATUS, In_Pep_Session, In<binary_string>, InLength<>, Out<identity_list*>, Out<stringlist_t*>, Out<uint64_t>> ( &import_key_with_fpr_return) ),
FP( "export_key" , new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>, Out<char*>, Out<std::size_t>> ( &export_key) ),
FP( "find_keys" , new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>, Out<stringlist_t*>> ( &find_keys) ),
FP( "get_trust" , new FuncPC<PEP_STATUS, In_Pep_Session, InOut<pEp_identity*>> ( &get_trust) ),

8
server/server_version.cc
View File

@ -79,8 +79,9 @@ static const std::string VersionName =
// "(45) Kreuz Erfurt"; // fix of context-saved function parameters that would cause trouble when >1 request is processed in parallel.
// "(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)"
// "(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()
} // end of anonymous namespace
////////////////////////////////////////////////////////////////////////////
@ -119,7 +120,8 @@ const ServerVersion& server_version()
//static const ServerVersion sv(0,21,2); // JSON-165 the msg param of re_evaluate_message_rating() is now "inout" and not "in" any more
//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,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()
return sv;
}