Make cryptopp work

* include cryptopp headers with quotes otherwise
compiler on Linux can't see them
* use different cryptopp types for windows and linux
because MXE-built cryptopp version doesn't support CryptoPP:byte
and make refuses to build old cryptopp version on without errors

Author: Gatsik

CMakeLists.txt

@@ -57,6 +57,10 @@ endif()
 
 add_definitions(-DUID_PUBKEY_BYTES=${UID_PUBKEY_BYTES})
 
+if (WIN32)
+  add_definitions(-DWIN32FAFUID)
+endif()
+
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
 
 add_executable(faf-uid

uid.cpp

@@ -3,13 +3,13 @@
 #include <cassert>
 #include <stdint.h>
 
-#include <cryptopp/aes.h>
-#include <cryptopp/modes.h>
-#include <cryptopp/osrng.h>
-#include <cryptopp/rsa.h>
-#include <cryptopp/base64.h>
-#include <cryptopp/integer.h>
-#include <cryptopp/files.h>
+#include "cryptopp/aes.h"
+#include "cryptopp/modes.h"
+#include "cryptopp/osrng.h"
+#include "cryptopp/rsa.h"
+#include "cryptopp/base64.h"
+#include "cryptopp/integer.h"
+#include "cryptopp/files.h"
 
 #include <json/json.h>
 
@@ -134,9 +134,15 @@ int main(int argc, char *argv[])
               new CryptoPP::FileSink(std::cout), false /*insertLineBreaks*/
           );
       b.Put(paddingSize);
+#ifdef WIN32FAFUID
       b.Put(reinterpret_cast<const byte*>(iv_b64.c_str()), iv_b64.size());
       b.Put(reinterpret_cast<const byte*>(json_string_encrypted_b64.c_str()), json_string_encrypted_b64.size());
       b.Put(reinterpret_cast<const byte*>(aes_key_encrypted_base64.c_str()), aes_key_encrypted_base64.size());
+#else
+      b.Put(reinterpret_cast<const CryptoPP::byte*>(iv_b64.c_str()), iv_b64.size());
+      b.Put(reinterpret_cast<const CryptoPP::byte*>(json_string_encrypted_b64.c_str()), json_string_encrypted_b64.size());
+      b.Put(reinterpret_cast<const CryptoPP::byte*>(aes_key_encrypted_base64.c_str()), aes_key_encrypted_base64.size());
+#endif
       b.MessageEnd();
     }
   }