dropping C++11 requirement

Author: Martin Müllenhaupt

.gitignore

@@ -2,3 +2,4 @@ uid.build/**
 build/uid.build/**
 .idea/**
 __pycache__
+/CMakeLists.txt.user

.travis.yml

@@ -2,51 +2,40 @@ language: cpp
 matrix:
   include:
     - os: linux
-      sudo: false
-      env:
-      - UID_FILENAME=uid
-      - UID_PLATFORM='linux'
-      - CXX=g++-5
-      - CC=gcc-5
-      addons:
-       apt:
-         sources:
-         - ubuntu-toolchain-r-test
-         - george-edison55-precise-backports
-         packages:
-         - gcc-5
-         - cmake
-    - os: linux
-      sudo: false
+      sudo: required
       env:
       - UID_FILENAME=uid.exe
       - UID_PLATFORM='win32'
-      compiler: gcc
-      addons:
-       apt:
-         sources:
-         - ubuntu-toolchain-r-test
-         - george-edison55-precise-backports
-         packages:
-         - cmake
-         - gcc-4.8
-         - g++-4.8
-         - autopoint
-         - intltool
-         - gperf
-         - p7zip-full
+      - MXE_DIR=/usr/lib/mxe
+      - MXE_TARGET=i686-w64-mingw32.static
+      install:
+      - echo "deb http://pkg.mxe.cc/repos/apt/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mxeapt.list
+      - sudo apt-key adv --keyserver x-hkp://keys.gnupg.net --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB
+      - sudo apt-get update
+      - sudo apt-get --yes install mxe-i686-w64-mingw32.static-jsoncpp
+      - sudo apt-get --yes install mxe-i686-w64-mingw32.static-cryptopp
+      - sudo apt-get --yes install mxe-i686-w64-mingw32.static-icu4c
+      script:
+      - mkdir build && cd build
+      - $MXE_DIR/usr/bin/$MXE_TARGET-cmake >
+        -DCMAKE_BUILD_TYPE=MinSizeRel
+        -DUID_PUBKEY_BYTES=`../int_to_bytes.py $n`
+        ..
+      - make -j8
+      - cd ..
 
 env:
   global:
   - secure: gZJEU+r0BJYH3GxoQAUWUUAse6VlOT28pTnT07ft2vrutTr0Q9383OpNlxkCZ34BBXr2hDlwAYkO1oy4lLQoyjAe59KPSuTmbGZloI/4DojEuwxf5rDHeVK8YkA/cmP6UW2BHpBOCYor4l0lz9XihFPuiriiRiy0BkRK3mwMTBO18SmjbxXw49si1/6oVJupuT4UYUHQbu6MNAYyIPcPQKMPEYOdV5AkIb9cKM+QMpExC+Sby/f/4m68J9MygcM+YMbb+PuWvuUot4FzTrWjswLp1slbI8YdN7BoC4hyPlW9Tuquq40WSTeTf2S/BS1qkfvFHpddF5OEcGvfkameg7mo1J1ZZWv8wlrM513FWM+t4QKNkXadqFetbznm94bNrnVvU6R7Z7Utf4+zl4TW9z5lb8KyO+nu/qFlWf2qORyyVTmxXeLXaK9ZDtr5QFgPfk4tKcVlnD2ECtYcm35TtEJF5dkOpETYG30W+6fd1glw3oQKj5gWJrPCC50mss3C/zsWN2tHTbeGSgix3hNrDsJuMcELkDdJIkAAhn1WnVyAfdt5hSX9A0S4W131G5t6I00lZs1e+ZAzOr5+LvotLtg1W48xIQtrbv2GEBkZEyV/bsOoLSyTLFelN6ehiq/eALQEhHodxx8P3tDgi5jG4SKPcqdi6fSwnGfPvpbZbMI=
   - secure: V23UleSDM9vYuhFY68JY+VPBNF1DxFh0y7LB9U0RNql05dJv02QjU+W/eteAJ+VkhqrIq1XDaIMYp3/eon+tT+iT9xtIdaj0DreaWu0paCfaVITOHBYARDmTwwo7i/NvUdZbAyjKEc7dpxBkZwHZCpu9dIUOqXGg/cKmDQdKeNsNITJOsudueeeMp1P5eWj1om/PH/8PhwteSvJwTPXOKIhAj2IVL4EkiFkMEA9cIF4u/y6IkugnJsDCBqnr5SsioM6XXEbe6i0l9/ngSs2y20peFNnSITrzw/2xKlolLHfmFO/0ubmHAxBXC5W9cP4Fk2FGdY10rFh6MoCjgyjUYm0xfP+s6Nhx4yjkG9kNm1CXkl4TZyNdQu2qoVsrLJhZ4Y/yPiusmuWZWdlxu2l10UPrt35VtZtD5VosNZ/otMHErv/TLwEzqw3rpPW48Cyx/HeVg4PMTKad0amIsGpykW3ghLh7N0cvBqh3b0Yk7k2UsLf/6I7f1OcleUejDNpkoC/fjMSB/jQ6B3LfFMrzMur5kzzoqla6TLp/OWs9eoGXeu9Iw58XmvvMkcoNCQgntT2tm9t7XaOpURHDpKGwl5G59DbpWXFTq9qF5gjhT/9EuH18OtEzhkBA+jivR2P7lj9NeQMDqkww4wmgf740+8dcq82thqgY+Cckf/X2XZM=
 
-install:
-  - ./build_$UID_PLATFORM.sh
 script:
   - echo "Nothing."
+
 before_deploy:
   - export RELEASE_PKG_FILE=./build/$UID_FILENAME
+  - strip -s $RELEASE_PKG_FILE
+  
 deploy:
   provider: releases
   api_key:

CMakeLists.txt

@@ -8,6 +8,7 @@ if(NOT DEFINED JSONCPP_LIBRARIES)
   endif()
   pkg_search_module(JSONCPP REQUIRED jsoncpp)
 endif()
+
 include_directories(${JSONCPP_INCLUDE_DIRS})
 
 if(NOT DEFINED CRYPTOPP_LIBRARIES)
@@ -16,28 +17,36 @@ if(NOT DEFINED CRYPTOPP_LIBRARIES)
   endif()
   pkg_search_module(CRYPTOPP REQUIRED cryptopp)
 endif()
-include_directories(${CRYPTOPP_INCLUDE_DIRS})
 
-set(CMAKE_CXX_STANDARD 11)
+include_directories(${CRYPTOPP_INCLUDE_DIRS})
 
 if (WIN32)
+  if(NOT PKGCONFIG_FOUND)
+    find_package(PkgConfig REQUIRED)
+  endif()
+  pkg_search_module(ICU REQUIRED icu-uc)
+  include_directories(${ICU_INCLUDE_DIRS})
   set(machine_info_src machine_info_win.cpp)
   set(machine_info_libs
-        wbemuuid.lib
+    ${ICU_LIBRARIES}
+    wbemuuid.lib
       )
 else()
   set(machine_info_src machine_info_linux.cpp)
 endif()
 
-set(UID_PUBKEY_BYTES
-  "130,99,238,192,232,47,187,99,222,116,140,101,233,231,57,188,204,204,187,241,173,147,88,60,217,7,80,217"
-  CACHE STRING
-  "the public key used for encryption"
-  )
+if(NOT DEFINED UID_PUBKEY_BYTES)
+  message(WARNING "You need to set UID_PUBKEY_BYTES to the output of int_to_bytes.py. Using test public key.")
+  set(UID_PUBKEY_BYTES
+    "130,99,238,192,232,47,187,99,222,116,140,101,233,231,57,188,204,204,187,241,173,147,88,60,217,7,80,217"
+    CACHE STRING
+    "the public key used for encryption"
+    )
+endif()
 
 add_definitions(-DUID_PUBKEY_BYTES="${UID_PUBKEY_BYTES}")
 
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}-static")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
 
 add_executable(uid
   uid.cpp

machine_info_win.cpp

@@ -1,10 +1,10 @@
 #include "machine_info.h"
 
 #include <string>
+#include <sstream>
 #include <vector>
-#include <clocale>
-#include <codecvt>
-#include <locale>
+
+#include <unicode/unistr.h>
 
 #define _WIN32_DCOM
 #include <iostream>
@@ -163,10 +163,6 @@ std::vector<std::string> read_wmi_values(std::wstring const& table,
     query += L" WHERE ";
     query += filter;
   }
-  //std::wcout << "query " << query << std::endl;
-
-  using convert_type = std::codecvt_utf8<wchar_t>;
-  std::wstring_convert<convert_type, wchar_t> converter;
 
   IEnumWbemClassObject* pEnumerator = NULL;
 
@@ -206,7 +202,6 @@ std::vector<std::string> read_wmi_values(std::wstring const& table,
       VARIANT vtProp;
       VariantInit(&vtProp);
 
-      //std::cout << "enum1" << std::endl;
       // Get the value of the Name property
       hres = pclsObj->Get(property.c_str(), 0, &vtProp, 0, 0);
 
@@ -226,21 +221,19 @@ std::vector<std::string> read_wmi_values(std::wstring const& table,
           break;
       }
 
-      //std::cout << "enum2" << std::endl;
       if (vtProp.vt == VT_BSTR)
       {
-        int wslen = ::SysStringLen(vtProp.bstrVal);
-        //std::cout << "enum2.5 " << wslen << std::endl;
-        result.push_back(converter.to_bytes(std::wstring(vtProp.bstrVal, wslen)));
+        std::string propString;
+        UnicodeString(vtProp.bstrVal).toUTF8String(propString);
+        result.push_back(propString);
       }
       else if (vtProp.vt == VT_I4)
       {
-        result.push_back(std::to_string(vtProp.iVal));
+        result.push_back(static_cast< std::ostringstream & >(( std::ostringstream() << std::dec << vtProp.iVal ) ).str());
       }
-      //std::cout << "enum3" << std::endl;
+
       VariantClear(&vtProp);
 
-      //std::cout << "enum4" << std::endl;
       pclsObj->Release();
   }
   pEnumerator->Release();
@@ -251,7 +244,7 @@ std::string wmi_value(std::wstring const& table,
                       std::wstring const& property,
                       std::wstring const& filter = std::wstring())
 {
-  auto values = read_wmi_values(table,
+  std::vector<std::string> values = read_wmi_values(table,
                                 property,
                                 filter);
 

uid.cpp

@@ -1,7 +1,7 @@
 #include <string>
 #include <iostream>
 #include <cassert>
-#include <cstdint>
+#include <stdint.h>
 
 #include <cryptopp/aes.h>
 #include <cryptopp/modes.h>