Initial commit for xpir as a library

.gitignore

+/local/
+/_build/

CMakeCompilers.txt

+include(CheckCXXCompilerFlag)
+
+# C++11 support
+CHECK_CXX_COMPILER_FLAG(-std=c++11 COMPILER_SUPPORTS_CXX11)
+if(COMPILER_SUPPORTS_CXX11)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+else()
+    CHECK_CXX_COMPILER_FLAG(-std=c++0x COMPILER_SUPPORTS_CXX0X)
+    if(COMPILER_SUPPORTS_CXX0X)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    else()
+        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+    endif()
+endif()
+
+# Use openmp
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+set(CMAKE_EXE_LINKER_FLAGS "-fopenmp")
+
+# optimization flags support
+if(CMAKE_BUILD_TYPE MATCHES Release)
+	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3")
+	foreach(FLAG -march=native -mtune=native -funroll-loops)
+		string(REGEX REPLACE -= _ FLAG_ID ${FLAG})
+		string(TOUPPER ${FLAG_ID} FLAG_ID)
+		CHECK_CXX_COMPILER_FLAG(${FLAG} COMPILER_SUPPORTS${FLAG_ID})
+	    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAG}")
+	endforeach()
+  # For OSX use clang
+  if(APPLE)
+	    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse -Wa,-q")
+  endif()
+else()
+    add_definitions(-DCHECK_STRICTMOD)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
+endif()
+

CMakeLists.txt

+cmake_minimum_required(VERSION 2.6.0)
+project(XPIR)
+include(CMakeCompilers.txt)
+
+enable_language(CXX ASM)
+
+if(APPLE)
+    cmake_policy(SET CMP0042 NEW)
+endif()
+
+set(CMAKE_C_COMPILER "gcc")
+set(CMAKE_CXX_COMPILER "g++")
+set(CMAKE_CXX_FLAGS "-std=c++11 -fopenmp -ggdb")
+set(CMAKE_EXE_LINKER_FLAGS "-fopenmp")
+set(BOOST_ROOT "./local")
+
+SET( Boost_USE_STATIC_LIBS FALSE )
+find_package(Boost 1.55.0  REQUIRED
+  COMPONENTS atomic chrono date_time exception program_options regex system thread)
+include_directories(${Boost_INCLUDE_DIR})
+link_directories(${Boost_LIBRARY_DIR})
+	
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
+find_package(GMP 6 REQUIRED)
+find_package(MPFR 3.1.2 REQUIRED)
+
+include_directories("/opt/local/include")
+
+	option(SEND_CATALOG "Send the catalog to the client (default is send catalog if |catalog|<1000)" ON)
+	if(SEND_CATALOG)
+	    message(STATUS "Send the catalog to the client")
+	    add_definitions(-DSEND_CATALOG)
+    else()
+	    message(STATUS "Do not send the catalog to the client")	
+	endif()
+	
+	option(MULTI_THREAD "Use multi-threading" ON)
+	if(MULTI_THREAD)
+	    message(STATUS "Use multi-threading")
+	    add_definitions(-DMULTI_THREAD)
+	else()
+	    message(STATUS "Do not use multi-threading")		
+	endif()
+	
+	option(PERF_TIMERS "Show performance measurements during execution" ON)
+	if(PERF_TIMERS)
+	    message(STATUS "Show performance measurements during execution")
+	    add_definitions(-DPERF_TIMERS)
+	else()
+	    message(STATUS "Do not show performance measurements during execution")
+	endif()
+
+
+
+
+	add_subdirectory("apps")
+	add_subdirectory("crypto")
+	add_subdirectory("pir")
+	
+	
+

FindGMP.cmake

+# Try to find the GMP librairies
+# GMP_FOUND - system has GMP lib
+# GMP_INCLUDE_DIR - the GMP include directory
+# GMP_LIBRARIES - Libraries needed to use GMP
+
+# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
+		# Already in cache, be silent
+		set(GMP_FIND_QUIETLY TRUE)
+endif (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
+
+find_path(GMP_INCLUDE_DIR NAMES gmp.h HINTS "./local/include")
+find_library(GMP_LIBRARIES NAMES gmp libgmp HINTS "./local/lib")
+find_library(GMPXX_LIBRARIES NAMES gmpxx libgmpxx HINTS "./local/lib")
+MESSAGE(STATUS "GMP libs: " ${GMP_LIBRARIES} " " ${GMPXX_LIBRARIES} )
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG GMP_INCLUDE_DIR GMP_LIBRARIES)
+
+mark_as_advanced(GMP_INCLUDE_DIR GMP_LIBRARIES)

FindMPFR.cmake

+# Try to find the MPFR librairies
+# GMP_FOUND - system has GMP lib
+# GMP_INCLUDE_DIR - the GMP include directory
+# GMP_LIBRARIES - Libraries needed to use GMP
+
+if (MPFR_INCLUDE_DIR AND MPFR_LIBRARIES)
+		# Already in cache, be silent
+		set(MPFR_FIND_QUIETLY TRUE)
+endif (MPFR_INCLUDE_DIR AND MPFR_LIBRARIES)
+
+find_path(MPFR_INCLUDE_DIR NAMES mpfr.h HINTS "./local/include")
+find_library(MPFR_LIBRARIES NAMES mpfr libmpfr HINTS "./local/lib")
+MESSAGE(STATUS "mpfr libs: " ${MPFR_LIBRARIES})
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPFR DEFAULT_MSG MPFR_INCLUDE_DIR MPFR_LIBRARIES)
+
+mark_as_advanced(MPFR_INCLUDE_DIR MPFR_LIBRARIES)

LICENSE

+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR is free software: you can redistribute it and/or modify
+ *	it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+The files in this project are released under various licenses, all of
+them compatible with the GPLv3.
+
+The dependencies directory at the root of the project contains: a full
+version of the GMP library; a full version of the MPFR library; and a
+subpart of the Boost library (extracted with their internal tool
+bcp). Licensing rules for the associated files are given directly in
+the corresponding directories. GMP and MPFR are released under GPLv3
+and Boost under Boost license which is compatible with GPLv3.
+
+For the rest of the project files, most are released under the GPLv3
+itself, but we reused some pieces of code sometimes, which are either
+under a BSD license, or in the public domain. Outside of the
+dependencies directory named above, the license for each file is given
+at the beggining of the file.
+

README.md

+XPIR: Private Information Retrieval for Everyone
+=================================================
+
+### XPIR v0.2.0-beta is released please get it here: https://github.com/XPIR-team/XPIR/releases
+
+This version introduces three major changes:
+  * Compilation with cmake instead of the classic autotools
+  * Dependencies are no longer included (the user can install them by himself or use a script to download and install them)
+  * An API allowing to use XPIR as a library has been released (see below)
+The original client/server applications are still available with the associated optimization tools. These can still be used for example to do some tests on PIR without developping an application or to use the optimization process as an oracle in order to get interesting cryptographic and PIR parameters for a given setting.
+
+**If you use OSX, there are compilation/execution issues with v0.2.0-beta.** The old version is still available in the branch old-master and of course through previous [releases](https://github.com/XPIR-team/XPIR/releases). 
+
+Introduction:
+=============
+
+XPIR allows a user to privately download an element from a database. This means that the database server knows that she has sent a database element to the user but does not know which one. The scientific term for the underlying protocol is Private Information Retrieval (PIR). This library is described and studied in the paper:
+
+Carlos Aguilar-Melchor, Joris Barrier, Laurent Fousse, Marc-Olivier Killijian, "XPIR: Private Information Retrieval for Everyone", Proceedings on Privacy Enhancing Technologies. Volume 2016, Issue 2, Pages 155–174, ISSN (Online) 2299-0984, DOI: 10.1515/popets-2016-0010, December 2015. 
+
+If you use our library, or a sub-part, such a NFLlib, please cite this paper on your work.
+
+This project is closely related to another project available at GitHub: [NFLlib](https://github.com/quarkslab/NFLlib). The NTT-based Fast Lattice library, which allows fast cryptographic computations over ideal lattices. Adapting this project to a more recent version of NFLlib would provide a performance boost but would be a lot of work so we are not planning to do it immediately. 
+
+*Important Note 1*: A PIR implementation for a specific application can be much simpler and more compact than this library. Indeed, much of the code of XPIR is aimed to ensure that the library delivers good performance in a large span of applications *without user interaction* so that the user does not need to be an expert on PIR or cryptography to use it with good performance results. **If you want to use a PIR protocol for a very specific setting feel free to contact us for building up a collaboration !**
+
+*Important Note 2*: For publication issues, a small part of the code is missing. From a technical point of view this correspond to the gaussian noise generator for LWE which is replaced by a uniform noise generator until some scientific results are published. Replacing our uniform noise generator with our gaussian noise generator does not impact performance in an observable way.
+
+*Important Note 3*: This software cannot provide reliable privacy without more scrutiny on many details. We have tried to provide some resiliance to timing tests, but haven't tested them thoroughly. The random seed generation and pseudorandom generation use strong functions but we haven't done a thorough analysis of whether an idiotic fault is present in those critical sections of the code or not. No input verification is done by the server or client so many buffer overflows are potentially possible, etc. As is, the software *shows that privacy is possible* but cannot guarantee it against strong active adversaries (using timing attacks, introducing malformed entries, etc.) until it gets enough scrutiny.
+
+
+Installation:
+=============
+
+Requirements: 
+- 64-bits Linux OS: g++>=4.8, gcc>=4.8
+- Apple OSX: [Xcode](https://itunes.apple.com/fr/app/xcode/id497799835?mt=12), [Xcode Command Line Tools](https://developer.apple.com/library/ios/technotes/tn2339/_index.html) and [MacPorts](https://www.macports.org/install.php).
+
+Get a copy of the project with:
+- git clone git@github.com:XPIR-team/XPIR.git
+- or by downloading from https://github.com/XPIR-team/XPIR/archive/master.zip
+
+*On OSX only*, execute the following commands:
+ 
+```
+sudo port install gcc48
+sudo port select gcc mp-gcc48
+sudo port install clang-3.6
+sudo port select clang mp-clang-3.6
+```
+
+*On All systems*, execute the following commands:
+
+You need cmake, GMP (version 6) Mpfr (version 3.1.2), and some boost modules (atomic, chrono, date_time, exception, program_options, regex, system, thread, all in version 1.55.0) to build XPIR. You can install them by yourself on your system (if you know how to do it this will be the fastest option). You can also use the (slower but safer) script helper_script.sh that is in the root directory of the repository to retrieve the exact versions and compile them in a local directory (namely ./local/). If two versions of the required libraries exist (one local and one system-wide) the local will be taken preferently.
+
+
+To build, and test XPIR, run the following:
+
+```
+$> mkdir _build
+$> cd _build
+$> cmake .. -DCMAKE_BUILD_TYPE=Release 
+$> make
+$> make check
+```
+The first test should be pretty long (to build initial caches) and then a set of tests should be display CORRECT or "Skipping test...". If you get INCORRECT tests or core dump notifications then something went wrong ...
+
+*On OSX only*, if you have an old OSX version and very long paths, you may have this error:
+```
+error: install_name_tool: changing install names or rpaths can't be redone for: _build/apps/pir_server 
+(for architecture x86_64) because larger updated load commands do not fit
+```
+This is solved by moving XPIRe to a directory with a shorter path (so that hard paths to libraries can fit in the executable header). 
+
+By default, the server sends the full catalog to the client except if the catalog size is larger than 1000 items (defined in PIRSession.cpp). This default behavior can be changed by unseting the SEND_CATALOG define in CMakeLists.txt or via cmake -U option : -USEND_CATALOG.
+
+The following CMake options are relevant:
+
+Option                             | Description
+-----------------------------------|---------------------------------
+`-USEND_CATALOG`                   | Do not send the catalog to client (default is send catalog if |catalog|<1000)
+`-UMULTI_THREAD`                   | Do not use multi-threading
+`-UPERF_TIMERS`                    | Do not show performance measurements during execution
+
+
+Usage of XPIR as a library:
+===========================
+
+Besides a client and a server that can be used as standalone applications to do PIR protocols, we have (as of version 0.2) created a simple library that gives access to the major functions needed to build a PIR protocol (generate query, generate reply, extract reply, and helper functions). The API is in ./pir/libpir.h (from the build directory) and applications using this API must link dynamically or statically the libraries libpir.so/lippir_static.a (or libpir.dylib/lipbir_static.a for OSX) that can be found in the same directory as libpir.h. 
+
+A simple demonstration of how to use this API to build PIR protocols is available on the source tree at apps/simplepir/simple_pir.cpp. It can be run from apps/simplepir in the build tree.
+
+In order to compile a PIR protocol using the API, such as simplepir, one just need the library (either static or dynamic) and the includes. And compiling can be done with something like :
+g++ -std=c++11 simplePIR.cpp -I$include_dir -L$lib_dir -lpir_static -lgmp -lmpfr -fopenmp -lboost_thread -lboost_system
+
+Usage of the client/server apps:
+================================
+
+XPIR comes with a client and a server that allow anybody to test the library on simple examples. Both must be started on their respective directories. From the build directory, to start the server execute:
+```
+$ cd apps/server
+$ ./pir_server
+```
+And to start the client execute (on a different terminal):
+```
+$ cd apps/client
+$ ./pir_client
+```
+By default the client tries to reach a local server but a given IP address and port can be specified, use --help to get help on the different options for distant connections.
+
+If run without options the PIR server will look for files in a directory db inside the server directory and consider each file is a database element. The client will present a catalog of the files and ask the user to choose a file. When this is done the client will run an optimizer to decide which are the best cryptographic and PIR parameters to retrieve the file. Then he will send an encrypted PIR Query (i.e. a query that the server will mix with the database without understanding which element it allows to retrieve) to the server. The server then computes an encrypted PIR reply and sends it to the client. Finally, the client will decrypt this reply and store the resulting file in the reception directory inside the client directory.
+
+
+Available options for the server (pir_server command):
+=====================================================
+
+`-h,--help`                         
+Print a help message with the different options.
+
+`-z, --driven`    
+Server-driven mode. This mode is to be used when multiple clients will connect to the server with the same cryptographic and PIR parameters. This allows the server to import the database into RAM and to perform precomputations over the database for the first client which **significantly increases the performance for the following clients if LWE-based cryptography is used**. The first client will ask for a given configuration (depending on its optimizer and on the command-line constraints given to the client). After this configuration client, the server will tell the following clients that he is in server-driven mode and that the configuration is imposed. The configuration given by the first client is stored in file arg or in exp/PIRParams.cfg if arg is not specified for further usage (see -L option).
+
+`-L, --load_file arg`     
+Load cryptographic and PIR parameters from arg file. Currently unavailable (see issues).
+
+`-s, --split_file arg (=1)`    
+Only use first file in db directory and split it in arg database elements. This allows to have a large database with many fixed size elements (e.g. bits, bytes, 24-bit depth points) into a single file which is much more efficient from a file-system point of view than having many small files. Building databases from a single file with more complex approaches (e.g. csv, or sqlite files) would be a great feature to add to XPIR.
+
+`-p, --port arg (=1234)`    
+Port used by the server to listen to incoming connections, by default 1234.
+
+`--db-generator`                        
+Generate a fake database with random elements instead of reading it from a directory. This is useful for performance tests. It allows to deal with arbitrary databases without having to build them on the file-system and to evaluate performance costs without considering disk access limitations.
+
+`-n, --db-generator-files arg (=10)`    
+Number of files for the virtual database provided by the DB generator.
+
+`-l [ --db-generator-filesize ] arg (=12800000)`    
+Filesize in bytes for the files in the virtual database provided by the DB generator.
+
+`--no-pipeline`                         
+No pipeline mode. In this mode the server executes each task separately (getting the PIR Query, computing the reply, sending it). Only useful to measure the performance of each step separately.
+
+
+Available options for the client (pir_client command):
+=====================================================
+
+`-h, --help`                     
+Display a help message.
+
+`-i, --serverip arg (=127.0.0.1)`    
+Define the IP address at which the client will try to contact the pir_server.
+
+`-p [ --port ] arg (=1234)`          
+Define the port at which the client will try to contact the pir_server.
+
+`-c, --autochoice`               
+Don't display the catalog of database elements and automatically choose the first element without waiting for user input.
+
+`--dry-run`                          
+Enable dry-run mode. In this mode the client does not send a PIR Query. It runs the optimizer taking into account the command-line options and outputs the best parameters for each cryptosystem (currently NoCryptography, Paillier and LWE) with details on the costs evaluated for each phase (query generation, query sending, reply generation, reply sending, reply decryption). If a server is available it interacts with it to set the parameters: client-server throughput and server-client throughput. It also requests from the server the performance cache to evaluate how fast the server can process the database for each possible set of cryptographic parameters. If no server is available it uses default performance measures. The other parameters are set for the default example: a thousand mp3 files over ADSL, aggregation disabled and security k=80. Each of these parameters can be overridden on the command line.
+
+`--verbose-optim`                    
+Ask the optimizer to be more verbose on the intermediate choices and evaluations (as much output as in the dry-run mode).
+
+`--dont-write`                       
+Don't write the result to a file. For testing purposes, it still will process the reply (decryption of the whole answer).
+
+`-f, --file  arg`     
+Use a config file to test different optimizations in dry-run mode (see exp/sample.conf). Must be used with the --dry-run option or it is ignored. 
+
+
+Available options for the optimizer (through pir_client command):
+================================================================
+
+`-n, --file-nbr arg`    
+Used in dry-run mode only: Override the default number of database elements.
+
+`-l, --file-size ] arg`    
+Used in dry-run mode only: Override the default database element size (in bits).
+
+`-u, --upload arg`     
+Force client upload speed in bits/s (bandwidth test will be skipped). This is valid in dry-run or normal mode (e.g. if a user does not want to use more than a given amount of his bandwidth).
+
+`-d, --download arg`       
+Force client download speed in bits/s (bandwidth test will be skipped). This is valid in dry-run or normal mode.
+
+`-r, --crypto-params arg`     
+Limit with a regular expression arg to a subset of the possible cryptographic parameters. Parameters are dependent on each cryptographic system:
+  * NoCryptography if a trivial full database download is to be done after which pir_client stores only the element the user is interested in.
+  * Paillier:A:B:C if Paillier's cryptosystem is to be used with A security bits, a plaintext modulus of B bits and a ciphertext modulus of C bits.
+  * LWE:A:B:C if LWE is to be used with A security bits, polynomials of degree B and polynomial coefficients of C bits.
+For example it is possible to force just the cryptosystem with NoCryptography.\* or LWE.\*, or ask for a specific parameter set like Paillier:80:1024:2048. Specifying the security with this option is tricky as it must match exactly so better use -k for this purpose.
+
+`-k, --security arg (=80)`     
+Minimum security bits required for a set of cryptographic parameters to be considered by the optimizer.
+
+`--dmin arg (=1)`                  
+Min dimension value considered by the optimizer. Dimension is also called recursion in the literature. It is done trivially (see the scientific paper) and thus for dimension d query size is proportional to d n^{1/d} and reply size is exponential in d. For databases with many small elements a d>1 can give the best results, but only in exceptional situations having d>4 is interesting.
+
+`--dmax arg (=4)`             
+Max dimension value considered by the optimizer.
+
+`-a, --alphaMax  arg (=0)`       
+Max aggregation value to test (1 = no aggregation, 0 = no limit). It is sometimes interesting to aggregate a database with many small elements into a database with fewer but larger aggregated elements (e.g. if database elements are one bit long). This value forces the optimizer to respect a maximum value for aggregation, 1 meaning that elements cannot be aggregated.
+
+`-x, --fitness arg (=1)`    
+Set fitness method to: 
+0=SUM Sum of the times on each task
+1=MAX Max of server times + Max of client times
+2=CLOUD Dollars in a cloud model (see source code)
+This sets the target function of the optimizer. When studying the different parameters the optimizer will choose the one that minimizes this function. 0 corresponds to minimizing the resources spent, 1 to minimizing the round-trip time (given that server operations have are pipelined and client operations are also, independently, pipelined), 2 corresponds to minimizing the cost by associating CPU cycles and bits transmitted to money using a cloud computing model.
+
+
+Contributors:
+=============
+
+This project has been imported to GitHub once mature enough by Carlos Aguilar Melchor which erased all the possible "blames" attributing to each contributor each line of code. In order to give a fair idea of the line contributions per author, the following command:
+```
+git ls-tree --name-only -z -r HEAD|egrep -z -Z -E '\.(cc|h|cpp|hpp|c|txt)$'  |egrep -z -Z -E -v dependencies|egrep -z -Z -E -v boost|xargs -0 -n1 git blame --line-porcelain|grep "^author "|sort|uniq -c|sort -nr
+```
+which counts the lines by contributor for the initial commit put into GitHub (removing the dependencies directory which does not correspond to code we developed) gave the following output (aggregating aliases) just before transfering the project to GitHub:
+```
+7655 author Carlos Aguilar-Melchor
+5693 author Joris Barrier
+1153 author Marc-Olivier Killijian
+```
+Besides this line counting, the roles were distributed as follows:    
+Carlos Aguilar-Melchor (Associate Professor): co-supervisor, developer    
+Joris Barrier (PhD student): developer    
+Marc-Olivier Killijian (Researcher): co-supervisor, developer    
+
+Affiliations:
+=============
+Carlos Aguilar Melchor has been during almost all this project affiliated to the XLIM laboratory in Limoges, he is currently at IRIT laboratory in Toulouse. Joris Barrier and Marc-Olivier Killijian are affiliated to the LAAS-CNRS laboratory in Toulouse. 
+
+The contributors thank Laurent Fousse for his help on evaluating the performance of NTRU.
+ 

TODO.txt

+  * verifier les makefiles originaux pour etre surs qu on oublie rien qu on faisait en master
+  
+  * verifier d'autres archi/install systeme (osx par exemple en particulier là ou il traine des $home)
+  * gerer la compilation release en OSX
+

apps/CMakeLists.txt

+cmake_minimum_required(VERSION 2.6.0)
+
+add_subdirectory("client")
+add_subdirectory("optim")
+add_subdirectory("server")
+add_subdirectory("simplepir")
+
+set(CMAKE_CXX_FLAGS "-std=c++11")
+set (CMAKE_EXE_LINKER_FLAGS "-fopenmp")
+if (APPLE)
+        set(CMAKE_EXE_LINKER_FLAGS "-fopenmp -L$ENV{HOME}/Code/xpir/freshxpir/xpir-ng/local/lib/ -lboost_program_options")
+
+endif()
+include_directories(..)
+include_directories(../..)
+
+add_custom_target(build-time-make-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "server/db")
+add_custom_target(build-time-make-directory1 ALL COMMAND ${CMAKE_COMMAND} -E make_directory "server/exp")
+add_custom_target(build-time-make-directory2 ALL COMMAND ${CMAKE_COMMAND} -E make_directory "client/reception")
+add_custom_target(build-time-make-directory3 ALL COMMAND ${CMAKE_COMMAND} -E make_directory "client/exp")
+
+#add_executable(simple_pir simplePIR.cpp ../pir/libpir.hpp ./server/DBGenerator.cpp ./server/DBDirectoryProcessor.cpp)
+
+#target_link_libraries(simple_pir pir_server_pir pir_query_gen pir_reply pir pir_client_events pir_client_optim pthread ${MPFR_LIBRARIES} ${Boost_LIBRARIES} ${GMP_LIBRARIES} ${GMPXX_LIBRARIES})

apps/client/CMakeLists.txt

+cmake_minimum_required(VERSION 2.6.0)
+
+set (CMAKE_EXE_LINKER_FLAGS "-fopenmp") 
+if (APPLE)
+	set(CMAKE_EXE_LINKER_FLAGS "-fopenmp -L$ENV{HOME}/Code/xpir/freshxpir/xpir-ng/local/lib/ -lboost_program_options")
+
+endif()
+include_directories(..)
+include_directories(../..)
+
+add_executable(pir_client DESC.cpp PIRClient.cpp PIRClientLog.cpp PIRController.cpp PIRView.cpp PIRViewCLI.cpp main.cpp)
+
+target_link_libraries(pir_client pir_client_optim pir pthread ${MPFR_LIBRARIES} ${Boost_LIBRARIES} ${GMP_LIBRARIES} ${GMPXX_LIBRARIES})
+

apps/client/DESC.cpp

+/* Copyright (C) 2014 Carlos Aguilar Melchor, Joris Barrier, Marc-Olivier Killijian
+ * This file is part of XPIR.
+ *
+ *  XPIR is free software: you can redistribute it and/or modify
+ *	it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  XPIR is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XPIR.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "DESC.hpp"
+//#define NO_CATALOG //Use this option for performance tests (only with auto-choice)
+
+/**
+ *	Class constructor.
+ *	Param :
+ *		-	messageListener& messageListeners_ : message listerner reference to display error message.
+ **/
+DESC::DESC(messageListener& messageListeners_):
+	messageListeners(messageListeners_),
+	maxFileSize(0)
+{
+    ; // This semicolon is necessary under some uncertain circumstances .... e.g. OSX/gcc4.8.1
+}
+
+/**
+ *	Generate a menu from a char* buffer.
+ *	Param :
+ *		- char* receiveBuffer : buffer to parse.
+ **/
+void DESC::makeMenu(char* receivedBuffer)
+{
+	maxFileSize = 0;
+	uint64_t fileCount = 0;
+	char fileName[FILENAME_MAX_BYTE_SIZE + 1];
+	char tmpSize[FILENAME_MAX_BYTE_SIZE + 1];
+	stringstream ss (receivedBuffer);
+	unsigned int catalogType;
+#ifdef DEBUG
+  std::cout << "DESC: catalog received : ..."<<std::endl<<receivedBuffer<<std::endl;
+#endif
+	if (ss.good ())
+	{
+		//The first line of the catalog is the catalog type
+		ss >> catalogType;
+		if(catalogType==0) {
+#ifdef DEBUG
+			std::cout << "DESC: catalog type 0 : "<<catalogType<<std::endl;
+#endif		
+			ss >> fileCount;
+			//The rest of catalog alternates filename lines and size lines.
+			ss.getline (fileName, FILENAME_MAX_BYTE_SIZE);
+
+      nbFiles = 0;
+			for (uint64_t i = 0; i < fileCount; i++) 
+			{
+				ss.getline (fileName, FILENAME_MAX_BYTE_SIZE);
+				ss.getline (tmpSize, FILENAME_MAX_BYTE_SIZE);
+
+				if (ss.gcount () > 0) 
+				{
+					fileList.push_back(fileName);
+					fileSize.push_back(atoi(tmpSize));
+          nbFiles++;
+#ifdef DEBUG
+          std::cout<<"DESC: "<<i<<"-"<<fileName<<"-"<<tmpSize<<std::endl;
+#endif
+          if(maxFileSize < fileSize.back())
+						maxFileSize = fileSize.back();
+				}
+			}
+		} else if(catalogType==1) {
+#ifdef DEBUG
+			std::cout << "DESC: catalog type 0 : "<<catalogType<<std::endl;
+#endif		
+			
+			ss >> fileCount;
+			ss.getline (tmpSize, FILENAME_MAX_BYTE_SIZE);
+			ss.getline (tmpSize, FILENAME_MAX_BYTE_SIZE);
+			maxFileSize=atoi(tmpSize);
+#ifndef NO_CATALOG
+      for (uint64_t i = 0; i < fileCount; i++) 
+			{
+					fileList.push_back(std::to_string(i));
+					fileSize.push_back(maxFileSize);
+			}
+#endif
+      nbFiles = fileCount;
+		} else {
+			MessageEvent event(ERROR,"Catalog type unknown "+catalogType, __FUNCTION__);
+			messageListeners(event);
+		}
+	} else {
+			MessageEvent event(ERROR,"Impossible to read catalog from the server.", __FUNCTION__);
+			messageListeners(event);
+	}
+}
+
+/**
+ *	Get file name from a given index.
+ *	Param :
+ *		- int index : file index.
+ *
+ *	Return :
+ *		- std::string : return fileName if exist and "None" else.
+ **/
+string DESC::getFileName(uint64_t index) 
+{
+#ifndef NO_CATALOG
+	return (index < nbFiles) ?  fileList[index] : "None";
+#else
+	return (index < nbFiles) ?  std::to_string(index) : "None";
+#endif
+}
+
+/**
+ *	Get file size frome a given index.
+ *	Param :
+ *		- int index : file index.
+ *
+ *	Return :
+ *		- int : return fileSize of exist and 0 else.
+ *
+ **/
+uint64_t DESC::getFileSize(uint64_t index) 
+{
+#ifndef NO_CATALOG
+	return (index < fileSize.size()) ? fileSize[index] : -1;
+#else
+	return (index < nbFiles) ? maxFileSize : -1;
+#endif
+}
+
+/**
+ *	Checks whether the provided file number exists. 
+ *	Param : 
+ *		- int dex : file index.
+ *
+ *	Return :
+ *		- bool : true if file exist, false else.
+ **/
+bool DESC::file_exists (uint64_t index) 
+{
+	return (index < nbFiles) ? true : false; 
+}
+
+/**
+ *	Get number of files.
+ *	Return :
+ *		- unsigned int : number of files.
+ **/
+uint64_t DESC::getFilesNum() 
+{
+	return nbFiles;
+}
+
+/**
+ *	Get the biggest file.
+ *	Return :