merge JSON-92 into "default" again.
authorRoker <roker@pep-project.org>
Tue, 15 May 2018 10:58:43 +0200
changeset 50918e1355d488f
parent 506 e2ac866205fc
parent 508 a2b403816229
child 510 9e3d54f2e1b8
child 543 0d96e14247fc
merge JSON-92 into "default" again.
server/ev_server.cc
     1.1 --- a/server/ev_server.cc	Fri May 04 12:24:30 2018 +0200
     1.2 +++ b/server/ev_server.cc	Tue May 15 10:58:43 2018 +0200
     1.3 @@ -62,7 +62,7 @@
     1.4  			Out<char*>, In<PEP_enc_format>, In<PEP_encrypt_flags_t>>( &MIME_encrypt_message_for_self ) ),
     1.5  			
     1.6  		FP( "MIME_decrypt_message", new Func<PEP_STATUS, In<PEP_SESSION, false>, In<c_string>, In<size_t>,
     1.7 -			Out<char*>, Out<stringlist_t*>, Out<PEP_rating>, InOutP<PEP_decrypt_flags_t>, Out<c_string>>( &MIME_decrypt_message ) ),
     1.8 +			Out<char*>, InOutP<stringlist_t*>, Out<PEP_rating>, InOutP<PEP_decrypt_flags_t>, Out<c_string>>( &MIME_decrypt_message ) ),
     1.9  		
    1.10  		FP( "startKeySync", new Func<void, In<JsonAdapter*, false>>( &JsonAdapter::startSync) ),
    1.11  		FP( "stopKeySync",  new Func<void, In<JsonAdapter*, false>>( &JsonAdapter::stopSync ) ),
    1.12 @@ -73,7 +73,7 @@
    1.13  		FP( "encrypt_message_for_self", new Func<PEP_STATUS, In<PEP_SESSION, false>,
    1.14  			In<pEp_identity*>, In<message*>, In<stringlist_t*>, Out<message*>, In<PEP_enc_format>, In<PEP_encrypt_flags_t>>( &encrypt_message_for_self ) ),
    1.15  		
    1.16 -		FP( "decrypt_message", new Func<PEP_STATUS, In<PEP_SESSION, false>, InOut<message*>, Out<message*>, Out<stringlist_t*>, Out<PEP_rating>, InOutP<PEP_decrypt_flags_t>>(  &decrypt_message ) ),
    1.17 +		FP( "decrypt_message", new Func<PEP_STATUS, In<PEP_SESSION, false>, InOut<message*>, Out<message*>, InOutP<stringlist_t*>, Out<PEP_rating>, InOutP<PEP_decrypt_flags_t>>(  &decrypt_message ) ),
    1.18  		FP( "outgoing_message_rating", new Func<PEP_STATUS, In<PEP_SESSION,false>, In<message*>, Out<PEP_rating>>( &outgoing_message_rating ) ),
    1.19  		FP( "identity_rating" , new Func<PEP_STATUS, In<PEP_SESSION,false>, In<pEp_identity*>, Out<PEP_rating>>( &identity_rating) ),
    1.20  		
     2.1 --- a/server/server_version.cc	Fri May 04 12:24:30 2018 +0200
     2.2 +++ b/server/server_version.cc	Tue May 15 10:58:43 2018 +0200
     2.3 @@ -64,7 +64,8 @@
     2.4  //const ServerVersion sv(0,13,0);  // add package_version, rename "version" into "api_version" in ServerVersion, add versions from the Engine, too
     2.5  //const ServerVersion sv(0,13,1);  // JSON-91: add MIME_encrypt_message_for_self() and encrypt_message_for_self()
     2.6  //const ServerVersion sv(0,14,0);  // JSON-75: incompatible behavior of daemonize() especially in MS Windows
     2.7 -const ServerVersion sv(0,15,0);  // JSON-92: API CHANGE.
     2.8 +//const ServerVersion sv(0,15,0);  // JSON-92: API CHANGE.
     2.9 +const ServerVersion sv(0,15,1);  // JSON-92 again: Change "keylist" in (MIME_)decrypt_message() from Out to InOutP. Is a compatible API change for JSON/JavaScript due to the handling of output parameters. :-)
    2.10  
    2.11  } // end of anonymous namespace
    2.12  ////////////////////////////////////////////////////////////////////////////