merge 'default' into 'JSON-156'

.hgignore

@@ -64,6 +64,8 @@ build-windows/libevent/Debug/*
 build-windows/pEpJSONServerAdapter/Release/*
 build-windows/pEpJSONServerAdapter/Debug/*
 
+server/pEp-mini-json-adapter
+
 *.d.*
 .??*.swp
 tags

server/Makefile

@@ -10,12 +10,13 @@ endif
 
 PEP_WEBSERVER?=../../webserver
 PEP_ADAPTER_LIBRARY=../../libpEpAdapter
-PEP_ENGINE?=../../pEpEngine
-LIBETPAN_FDIK?=../../libetpan
-SEQOUIA_PGP?=../../sequoia
+PEP_ENGINE?=../../pEpEngine/src
+LIBETPAN_FDIK?=../../libetpan/src/.libs
+SEQUOIA_PGP?=../../sequoia/target/release
 NETTLE?=../../nettle
 BOOST_INCLUDE_PATH?=../../boost_1_72_0
 BOOST_LIBRARY_PATH?=../../boost_1_72_0/stage/lib
+ASN1_PATH?=$(PEP_ENGINE)/asn.1
 
 # path to installed libraries
 
@@ -93,10 +94,11 @@ $(TARGET): $(LIB_TARGET) $(MA_OBJECTS) $(SPIRIT_OBJECTS)
 		$(SQLITE3_LIBRARY_PATH)/libsqlite3.a \
 		$(GMP_LIBRARY_PATH)/libgmp.a \
 		$(NETTLE)/libnettle.a $(NETTLE)/libhogweed.a \
-		$(SEQOUIA_PGP)/target/release/libsequoia_ffi.a \
-		$(SEQOUIA_PGP)/target/release/libsequoia_openpgp_ffi.a \
-		$(LIBETPAN_FDIK)/src/.libs/libetpan.a \
-		$(PEP_ENGINE)/src/libpEpEngine.a $(PEP_ENGINE)/asn.1/libasn1.a \
+		$(SEQUOIA_PGP)/libsequoia_ffi.a \
+		$(SEQUOIA_PGP)/libsequoia_openpgp_ffi.a \
+		$(LIBETPAN_FDIK)/libetpan.a \
+		$(PEP_ENGINE)/libpEpEngine.a \
+		$(ASN1_PATH)/libasn1.a \
 		$(PEP_ADAPTER_LIBRARY)/libpEpAdapter.a \
 		$(MA_OBJECTS) $(SPIRIT_OBJECTS) $(LIB_TARGET) -o "$@"
 
@@ -144,7 +146,7 @@ local.conf:
 	@echo >> local.conf
 	@echo "# path to Sequoia PGP" >> local.conf
 	@echo >> local.conf
-	@echo "SEQOUIA_PGP=$(SEQOUIA_PGP)" >> local.conf
+	@echo "SEQUOIA_PGP=$(SEQUOIA_PGP)" >> local.conf
 	@echo >> local.conf
 	@echo "# path to nettle and hogweed crypto libraries" >> local.conf
 	@echo >> local.conf

server/ev_server.cc

@@ -95,7 +95,7 @@ const FunctionMap functions = {
 		FP( "pEp Engine Core API", new Separator),
 //		FP( "log_event",  new Func<PEP_STATUS, In_Pep_Session, In<c_string>, In<c_string>, In<c_string>, In<c_string>>( &log_event) ),
 		FP( "get_trustwords", new FuncPC<PEP_STATUS, In_Pep_Session, In<const pEp_identity*>, In<const pEp_identity*>, In<Language>, Out<char*>, Out<size_t>, In<bool>>( &get_trustwords) ),
-		FP( "re_evaluate_message_rating", new FuncPC<PEP_STATUS, In_Pep_Session, In<message *>, In<stringlist_t *>, In<PEP_rating>, Out<PEP_rating>>( &re_evaluate_message_rating ) ),
+		FP( "re_evaluate_message_rating", new FuncPC<PEP_STATUS, In_Pep_Session, InOut<message *>, In<stringlist_t *>, In<PEP_rating>, Out<PEP_rating>>( &re_evaluate_message_rating ) ),
 		FP( "get_languagelist", new FuncPC<PEP_STATUS, In_Pep_Session, Out<char*>>( &get_languagelist) ),
 //		FP( "get_phrase"      , new Func<PEP_STATUS, In_Pep_Session, In<Language>, In<int>, Out<char*>> ( &get_phrase) ),
 //		FP( "get_engine_version", new Func<const char*> ( &get_engine_version) ),

server/function_map.hh

@@ -132,9 +132,6 @@ public:
 			try {
 
 				const js::Array ret_ = ret.get_array()[0].get_array();
-#ifndef NDEBUG
-				std::string _ret_ = js::write(ret_);
-#endif
 				return ret_;
 			}
 			catch (std::runtime_error&) {

server/server_version.cc

@@ -112,8 +112,8 @@ const ServerVersion& server_version()
 //static const ServerVersion sv(0,20,0);  // JSON-152: 2-parameter version of pollForEvents().
 //static const ServerVersion sv(0,20,1);  // JSON-153: passphrase support
 //static const ServerVersion sv(0,21,0);  // import_key() expects binary data, so they are always base64-encoded!
-static const ServerVersion sv(0,21,1);  // wrap _all_ Engine functions with passphrase_cache.api(), except config_*() functions.
-
+//static const ServerVersion sv(0,21,1);  // wrap _all_ Engine functions with passphrase_cache.api(), except config_*() functions.
+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
 	return sv;
 }