JSON-120 : add support for key_reset_identity(), key_reset_user(), and key_reset_all_own_keys()

server/ev_server.cc

@@ -14,6 +14,7 @@
 
 #include <pEp/message_api.h>
 #include <pEp/blacklist.h>
+#include <pEp/key_reset.h>
 #include <pEp/openpgp_compat.h>
 #include <pEp/mime.h>
 
@@ -126,6 +127,9 @@ const FunctionMap functions = {
 		FP( "own_key_is_listed", new Func<PEP_STATUS, In_Pep_Session, In<c_string>, Out<bool>> ( &own_key_is_listed) ),
 		FP( "own_identities_retrieve", new Func<PEP_STATUS, In_Pep_Session, Out<identity_list*>>( &own_identities_retrieve ) ),
 		FP( "set_own_key", new Func<PEP_STATUS, In_Pep_Session, InOut<pEp_identity*>, In<c_string>>( &set_own_key ) ),
+		FP( "key_reset_identity", new Func<PEP_STATUS, In_Pep_Session, In<pEp_identity*>, In<c_string>>( &key_reset_identity) ),
+		FP( "key_reset_user",     new Func<PEP_STATUS, In_Pep_Session, In<c_string>     , In<c_string>>( &key_reset_user) ),
+		FP( "key_reset_all_own_keys",  new Func<PEP_STATUS, In_Pep_Session>( &key_reset_all_own_keys) ),
 		
 		FP( "myself"        , new Func<PEP_STATUS, In_Pep_Session, InOut<pEp_identity*>> ( &myself) ),
 		FP( "update_identity", new Func<PEP_STATUS, In_Pep_Session, InOut<pEp_identity*>> ( &update_identity) ),

server/server_version.cc

@@ -91,7 +91,8 @@ const ServerVersion& server_version()
 //static const ServerVersion sv(0,15,3);  // JSON-110: add encrypt_message_and_add_priv_key()
 //static const ServerVersion sv(0,15,4);  // JSON-117: add trust_own_key()
 //static const ServerVersion sv(0,15,5);  // JSON-119: add get_key_rating_for_user()
-static const ServerVersion sv(0,16,0);  // Kick-out Enigmail 2.0 compat, remove MIME_*() methods, deliverHandshakeResult() changes parameter types
+//static const ServerVersion sv(0,16,0);  // Kick-out Enigmail 2.0 compat, remove MIME_*() methods, deliverHandshakeResult() changes parameter types
+static const ServerVersion sv(0,16,1);  // JSON-120: add support for key_reset_identity(), key_reset_user(), and key_reset_all_own_keys()
 
 	return sv;
 }