Force utf8 codepage to windows cdoc-tool (#115)

Author: lauris71

CMakeLists.txt

@@ -4,7 +4,7 @@ if(POLICY CMP0167)
     cmake_policy(SET CMP0167 NEW)
 endif()
 
-project(libcdoc VERSION 0.1.8)
+project(libcdoc VERSION 0.5.0)
 
 macro(SET_ENV NAME DEF)
     if(DEFINED ENV{${NAME}})

cdoc/CDoc.h

@@ -31,7 +31,6 @@ namespace libcdoc {
  */
 using result_t = int64_t;
 
-
 /**
  * @brief The public key type
  */
@@ -140,8 +139,19 @@ enum {
     UNSPECIFIED_ERROR = -199,
 };
 
+/**
+ * @brief Get the standard text description of error code
+ * 
+ * @param code the error code
+ * @return the text description
+ */
 CDOC_EXPORT std::string getErrorStr(int64_t code);
 
+/**
+ * @brief Get the library version
+ * 
+ * @return The version string
+ */
 CDOC_EXPORT std::string getVersion();
 
 // Logging interface
@@ -177,15 +187,33 @@ enum LogLevel : uint8_t
     LEVEL_DEBUG,
 
     /**
-     * @brief Most verbose level. Used for development, NOP in production code.
+     * @brief The most verbose level. Present only in development builds, ignored in production code.
      */
     LEVEL_TRACE
 };
 
 class Logger;
 
+/**
+ * @brief Set the Logger object for library
+ * 
+ * @param logger the Logger implementation
+ */
 CDOC_EXPORT void setLogger(Logger *logger);
+/**
+ * @brief Set logging level
+ * 
+ * @param level the requested logging level
+ */
 CDOC_EXPORT void setLogLevel(LogLevel level);
+/**
+ * @brief Log a message to the library logging system
+ * 
+ * @param level logging level
+ * @param file the source file name
+ * @param line the line in source file
+ * @param msg the message
+ */
 CDOC_EXPORT void log(LogLevel level, std::string_view file, int line, std::string_view msg);
 
 /**
@@ -198,10 +226,6 @@ struct FileInfo {
     int64_t size;
 };
 
-#ifdef VERSION
-#undef VERSION
-#endif
-
 namespace CDoc2 {
 namespace Label {
     /**

cdoc/CDoc1Writer.cpp

@@ -104,7 +104,7 @@ int64_t CDoc1Writer::Private::writeDocument(bool use_ddoc, const std::vector<Rec
             });
         }));
         return writeElement(DENC, "EncryptionProperties", [&] -> int64_t {
-            RET_ERROR(writeTextElement(DENC, "EncryptionProperty", {{"Name", "LibraryVersion"}}, "cdoc|0.0.1"));
+            RET_ERROR(writeTextElement(DENC, "EncryptionProperty", {{"Name", "LibraryVersion"}}, VERSION_STR));
             RET_ERROR(writeTextElement(DENC, "EncryptionProperty", {{"Name", "DocumentFormat"}}, documentFormat));
             RET_ERROR(writeTextElement(DENC, "EncryptionProperty", {{"Name", "Filename"}}, use_ddoc ? "tmp.ddoc" : files.at(0).name));
             for(const FileEntry &file: files)

cdoc/CDoc2Reader.cpp

@@ -226,6 +226,7 @@ CDoc2Reader::getFMK(std::vector<uint8_t>& fmk, unsigned int lock_idx)
             LOG_DBG("info: {}", toHex(info_str));
             kek = libcdoc::Crypto::expand(kek_pm, info_str, libcdoc::CDoc2::KEY_LEN);
         }
+#ifdef HAS_KEYSHARES
     } else  if (lock.type == Lock::Type::SHARE_SERVER) {
         /* SALT */
         std::vector<uint8_t> salt = lock.getBytes(Lock::SALT);
@@ -325,6 +326,7 @@ CDoc2Reader::getFMK(std::vector<uint8_t>& fmk, unsigned int lock_idx)
             }
         }
         LOG_INFO("Fetched all shares");
+#endif
     } else {
         setLastError(t_("Unknown lock type"));
         LOG_ERROR("Unknown lock type: %d", (int) lock.type);
@@ -576,6 +578,7 @@ CDoc2Reader::Private::buildLock(Lock& lock, const cdoc20::header::RecipientRecor
             lock.setInt(Lock::KDF_ITER, capsule->kdf_iterations());
         }
         return;
+#ifdef HAS_KEYSHARES
     case Capsule::recipients_KeySharesCapsule:
         if (const auto *capsule = recipient.capsule_as_recipients_KeySharesCapsule()) {
             if (capsule->recipient_type() != cdoc20::recipients::KeyShareRecipientType::SID_MID) {
@@ -607,6 +610,7 @@ CDoc2Reader::Private::buildLock(Lock& lock, const cdoc20::header::RecipientRecor
             lock.setString(Lock::RECIPIENT_ID, recipient_id);
         }
         return;
+#endif
     default:
         LOG_ERROR("Unsupported capsule type");
     }

cdoc/CDoc2Writer.cpp

@@ -305,6 +305,7 @@ CDoc2Writer::buildHeader(std::vector<uint8_t>& header, const std::vector<libcdoc
             } else {
                 fb_rcpts.push_back(createSymmetricKeyCapsule(builder, rcpt, salt, xor_key));
             }
+#ifdef HAS_KEYSHARES
         } else if (rcpt.isKeyShare()) {
             std::string url_list = conf->getValue(rcpt.server_id, libcdoc::Configuration::SHARE_SERVER_URLS);
             if (url_list.empty())
@@ -388,6 +389,7 @@ CDoc2Writer::buildHeader(std::vector<uint8_t>& header, const std::vector<libcdoc
                                                          builder.CreateVector(xor_key),
                                                          cdoc20::header::FMKEncryptionMethod::XOR);
             fb_rcpts.push_back(offset);
+#endif
         } else {
             FAIL("Invalid recipient type", libcdoc::UNSPECIFIED_ERROR);
         }

cdoc/CDocCipher.cpp

@@ -321,9 +321,11 @@ fill_recipients_from_rcpt_info(ToolConf& conf, ToolCrypto& crypto, std::vector<l
             key = libcdoc::Recipient::makeSymmetric(label, 65535);
             if (conf.gen_label)
                 key.setLabelValue(CDoc2::Label::LABEL, rcpt.label);
+#ifdef HAS_KEYSHARES
         } else if (rcpt.type == RcptInfo::Type::SHARE) {
             LOG_DBG("Creating keyshare recipient:");
             key = libcdoc::Recipient::makeShare(label, conf.servers[0].ID, "PNOEE-" + rcpt.id);
+#endif
         }
 
         rcpts.push_back(std::move(key));

cdoc/CMakeLists.txt

@@ -21,7 +21,7 @@ set(PUBLIC_HEADERS
 add_library(cdoc_ver INTERFACE)
 target_compile_definitions(cdoc_ver INTERFACE
     VERSION_STR="${VERSION}"
-    $<$<PLATFORM_ID:Windows>:VERSION=${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${BUILD_NUMBER}>
+    $<$<PLATFORM_ID:Windows>:VERSION_NUMBER=${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${BUILD_NUMBER}>
     $<$<PLATFORM_ID:Windows>:TARGET_NAME="$<TARGET_PROPERTY:NAME>">
     $<$<PLATFORM_ID:Windows>:$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:APP>>
 )
@@ -50,7 +50,7 @@ add_library(cdoc
     CDoc2Writer.cpp CDoc2Writer.h
     DDocReader.cpp DDocReader.h
     DDocWriter.cpp DDocWriter.h
-    KeyShares.cpp KeyShares.h
+    # KeyShares.cpp KeyShares.h
     XmlReader.cpp XmlReader.h
     XmlWriter.cpp XmlWriter.h
     RcptInfo.h
@@ -93,6 +93,9 @@ if(BUILD_TOOLS)
     add_executable(cdoc-tool cdoc-tool.cpp)
     target_include_directories(cdoc-tool PRIVATE ${OPENSSL_INCLUDE_DIR})
     target_link_libraries(cdoc-tool cdoc_ver cdoc)
+    target_link_options(cdoc-tool PRIVATE
+        $<$<PLATFORM_ID:Windows>: /MANIFEST:NO /MANIFEST:EMBED /MANIFESTINPUT:${CMAKE_CURRENT_SOURCE_DIR}/cdoc-tool.manifest>
+    )
     set_target_properties(cdoc-tool PROPERTIES
         INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:@executable_path/../lib>
     )

cdoc/Configuration.h

@@ -42,6 +42,7 @@ struct CDOC_EXPORT Configuration {
      * @brief Fetch URL of keyserver (Domain is server id)
      */
     static constexpr char const *KEYSERVER_FETCH_URL = "KEYSERVER_FETCH_URL";
+#ifdef HAS_KEYSHARES
     /**
      * @brief JSON array of share server base urls (Domain is server id)
      */
@@ -74,6 +75,7 @@ struct CDOC_EXPORT Configuration {
      * @brief Mobile ID phone number (domain is MOBILE_ID)
      */
     static constexpr char const *PHONE_NUMBER = "PHONE_NUMBER";
+#endif
 
 	Configuration() = default;
 	virtual ~Configuration() noexcept = default;
@@ -92,20 +94,20 @@ struct CDOC_EXPORT Configuration {
     virtual std::string getValue(std::string_view domain, std::string_view param) const {return {};}
 
     /**
-     * @brief get a value of configuration parameter from default domain
+     * @brief get a value of configuration parameter from the default domain
      * @param param the parameter name.
      * @return a string value or empty string if parameter is not defined.
      */
     std::string getValue(std::string_view param) const {return getValue({}, param);}
     /**
-     * @brief get boolean value of configuration parameter from default domain
+     * @brief get boolean value of configuration parameter from the default domain
      * @param param the parameter name
      * @param def_val the default value to return if parameter is not set
      * @return the parameter value
      */
     bool getBoolean(std::string_view param, bool def_val = false) const;
     /**
-     * @brief get integer value of configuration parameter from default domain
+     * @brief get integer value of configuration parameter from the default domain
      * @param param the parameter name
      * @param def_val the default value to return if parameter is not set
      * @return the key value
@@ -117,7 +119,7 @@ struct CDOC_EXPORT Configuration {
  * @brief A Configuration object implementation that reads values from JSON file
  * 
  * The file should represent a single object with key/value pairs
- * Domain should contain sub-objects with corresponding key/value pairs
+ * Domains are sub-objects with corresponding key/value pairs
  * Strings are returned unquoted, everything else is returned as JSON
  * 
  */

cdoc/Lock.h

@@ -68,10 +68,12 @@ struct CDOC_EXPORT Lock
          * @brief Public key stored on keyserver
          */
         SERVER,
+#ifdef HAS_KEYSHARES
         /**
          * @brief Symmetric key distributed on several servers
          */
         SHARE_SERVER
+#endif
     };
 
     /**
@@ -114,10 +116,12 @@ struct CDOC_EXPORT Lock
          * @brief Keyshare recipient ID
          */
         RECIPIENT_ID,
+#ifdef HAS_KEYSHARES
         /**
          * @brief Keyshare server urls (separated by ';')
          */
         SHARE_URLS,
+#endif
         /**
          * @brief CDoc1 specific
          */

cdoc/NetworkBackend.cpp

@@ -92,6 +92,7 @@ struct Private {
     }
 };
 
+#ifdef HAS_KEYSHARES
 struct MIDSIDResultData {
     int code;
     std::string_view str;
@@ -135,6 +136,7 @@ getMIDSIDDescription(libcdoc::result_t code)
     }
     return {};
 }
+#endif
 
 thread_local std::string error;
 
@@ -150,9 +152,11 @@ libcdoc::NetworkBackend::getLastErrorStr(result_t code) const
 	default:
 		break;
 	}
+#ifdef HAS_KEYSHARES
     std::string_view str = getMIDSIDDescription(code);
     if (!str.empty()) return std::string(str);
-    return libcdoc::getErrorStr(code);
+#endif
+   return libcdoc::getErrorStr(code);
 }
 
 //
@@ -312,6 +316,7 @@ libcdoc::NetworkBackend::sendKey (CapsuleInfo& dst, const std::string& url, cons
     return OK;
 }
 
+#ifdef HAS_KEYSHARES
 libcdoc::result_t
 libcdoc::NetworkBackend::sendShare(std::vector<uint8_t>& dst, const std::string& url, const std::string& recipient, const std::vector<uint8_t>& share)
 {
@@ -354,6 +359,7 @@ libcdoc::NetworkBackend::sendShare(std::vector<uint8_t>& dst, const std::string&
 
     return OK;
 }
+#endif
 
 libcdoc::result_t
 libcdoc::NetworkBackend::fetchKey (std::vector<uint8_t>& dst, const std::string& url, const std::string& transaction_id)
@@ -392,6 +398,7 @@ libcdoc::NetworkBackend::fetchKey (std::vector<uint8_t>& dst, const std::string&
     return libcdoc::OK;
 }
 
+#ifdef HAS_KEYSHARES
 libcdoc::result_t
 libcdoc::NetworkBackend::fetchNonce(std::vector<uint8_t>& dst, const std::string& url, const std::string& share_id)
 {
@@ -475,6 +482,7 @@ libcdoc::NetworkBackend::fetchShare(ShareInfo& share, const std::string& url, co
     share = {std::move(shareval), std::move(recipient)};
     return OK;
 }
+#endif
 
 ECDSA_SIG *
 ecdsa_do_sign(const unsigned char *dgst, int dgst_len, const BIGNUM * /*inv*/, const BIGNUM * /*rp*/, EC_KEY *eckey)
@@ -527,6 +535,7 @@ rsa_sign(int type, const unsigned char *m, unsigned int m_len, unsigned char *si
     return 1;
 }
 
+#ifdef HAS_KEYSHARES
 libcdoc::result_t
 libcdoc::NetworkBackend::showVerificationCode(unsigned int code)
 {
@@ -879,3 +888,4 @@ libcdoc::NetworkBackend::signMID(std::vector<uint8_t>& dst, std::vector<uint8_t>
 
     return OK;
 }
+#endif