diff options
Diffstat (limited to 'src/gpg')
| -rw-r--r-- | src/gpg/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/gpg/function/GpgKeyImportExporter.cpp | 25 | ||||
| -rw-r--r-- | src/gpg/function/GpgKeyImportExporter.h | 6 |
3 files changed, 31 insertions, 18 deletions
diff --git a/src/gpg/CMakeLists.txt b/src/gpg/CMakeLists.txt index ac01aa26..0ccc8171 100644 --- a/src/gpg/CMakeLists.txt +++ b/src/gpg/CMakeLists.txt @@ -9,8 +9,8 @@ set(UTILS_DIR ${CMAKE_SOURCE_DIR}/utils) set(GPGME_LIB_DIR ${UTILS_DIR}/gpgme/lib) -if (ESAY_LOGGING_PP) - message(STATUS "Link ESAY_LOGGING_PP") +if (EASY_LOGGING_PP) + message(STATUS "Link EASY_LOGGING_PP") set(THIRD_PARTY_LIBS easy_logging_pp config++) endif () @@ -33,13 +33,13 @@ elseif (APPLE) ${BOOST_LIBS} ${libgpgme} ${libgpg-error} ${libassuan} dl) - if(XCODE_BUILD) - set_target_properties(gpg_core - PROPERTIES - ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}) - endif() + if (XCODE_BUILD) + set_target_properties(gpg_core + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}) + endif () else () find_library(libgpgme NAMES libgpgme.a) find_library(libgpg-error NAMES libgpg-error.a) diff --git a/src/gpg/function/GpgKeyImportExporter.cpp b/src/gpg/function/GpgKeyImportExporter.cpp index ca9b86d1..33f865a7 100644 --- a/src/gpg/function/GpgKeyImportExporter.cpp +++ b/src/gpg/function/GpgKeyImportExporter.cpp @@ -60,24 +60,34 @@ GpgFrontend::GpgImportInformation GpgFrontend::GpgKeyImportExporter::ImportKey( * @param out_buffer output byte array * @return if success */ -bool GpgFrontend::GpgKeyImportExporter::ExportKeys( - KeyIdArgsListPtr& uid_list, ByteArrayPtr& out_buffer) const { +bool GpgFrontend::GpgKeyImportExporter::ExportKeys(KeyIdArgsListPtr& uid_list, + ByteArrayPtr& out_buffer, + bool secret) const { if (uid_list->empty()) return false; + std::stringstream ss; + + int _mode = 0; + + if (secret) _mode |= GPGME_EXPORT_MODE_SECRET; + // Alleviate another crash problem caused by an unknown array out-of-bounds // access auto all_success = true; for (size_t i = 0; i < uid_list->size(); i++) { GpgData data_out; - auto err = gpgme_op_export(ctx, (*uid_list)[i].c_str(), 0, data_out); + auto err = gpgme_op_export(ctx, (*uid_list)[i].c_str(), _mode, data_out); if (gpgme_err_code(err) != GPG_ERR_NO_ERROR) all_success = false; DLOG(INFO) << "exportKeys read_bytes" << gpgme_data_seek(data_out, 0, SEEK_END); auto temp_out_buffer = data_out.Read2Buffer(); - std::swap(out_buffer, temp_out_buffer); + + ss << *temp_out_buffer << std::endl; } + out_buffer = std::make_unique<ByteArray>(ss.str()); + return all_success; } @@ -87,11 +97,12 @@ bool GpgFrontend::GpgKeyImportExporter::ExportKeys( * @param outBuffer output byte array * @return if success */ -bool GpgFrontend::GpgKeyImportExporter::ExportKeys( - const KeyArgsList& keys, ByteArrayPtr& out_buffer) const { +bool GpgFrontend::GpgKeyImportExporter::ExportKeys(const KeyArgsList& keys, + ByteArrayPtr& out_buffer, + bool secret) const { KeyIdArgsListPtr key_ids = std::make_unique<std::vector<std::string>>(); for (const auto& key : keys) key_ids->push_back(key.id()); - return ExportKeys(key_ids, out_buffer); + return ExportKeys(key_ids, out_buffer, secret); } /** diff --git a/src/gpg/function/GpgKeyImportExporter.h b/src/gpg/function/GpgKeyImportExporter.h index b6c91303..64b3b8a9 100644 --- a/src/gpg/function/GpgKeyImportExporter.h +++ b/src/gpg/function/GpgKeyImportExporter.h @@ -88,9 +88,11 @@ class GpgKeyImportExporter GpgImportInformation ImportKey(StdBypeArrayPtr inBuffer); - bool ExportKeys(KeyIdArgsListPtr& uid_list, ByteArrayPtr& out_buffer) const; + bool ExportKeys(KeyIdArgsListPtr& uid_list, ByteArrayPtr& out_buffer, + bool secret = false) const; - bool ExportKeys(const KeyArgsList& keys, ByteArrayPtr& outBuffer) const; + bool ExportKeys(const KeyArgsList& keys, ByteArrayPtr& outBuffer, + bool secret = false) const; bool ExportKey(const GpgKey& key, ByteArrayPtr& out_buffer) const; |