SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@625 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2018-09-12 08:44:44 +00:00
parent 9b994d1ffd
commit d534225a8c
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
CMakeLists.txt
View File

@@ -485,24 +485,24 @@ endforeach()
# Build Documentation # Build Documentation
# #
find_package(Doxygen QUIET) # find_package(Doxygen QUIET)
if(Doxygen_FOUND) # if(Doxygen_FOUND)
message(STATUS "Building with documentation via Doxygen") # message(STATUS "Building with documentation via Doxygen")
#set(DOXYFILE_IN ${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in) # #set(DOXYFILE_IN ${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in)
set(DOXYFILE ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile) # set(DOXYFILE ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
#configure_file(${DOXYFILE_IN} ${DOXYFILE} @ONLY) # #configure_file(${DOXYFILE_IN} ${DOXYFILE} @ONLY)
add_custom_target(DOC # add_custom_target(DOC
COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYFILE} # COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Generating API documentation with Doxygen" # COMMENT "Generating API documentation with Doxygen"
VERBATIM) # VERBATIM)
add_custom_command(TARGET DOC # add_custom_command(TARGET DOC
POST_BUILD # POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/source/doc/Documentation.html ${CMAKE_SOURCE_DIR}/doc # COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/source/doc/Documentation.html ${CMAKE_SOURCE_DIR}/doc
) # )
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc) # install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc)
endif() # endif()

15
src_crypt/picrypt.cpp
View File

@@ -151,7 +151,20 @@ PIByteArray PICrypt::hash(const PIString & secret) {
#else #else
PICRYPT_DISABLED_WARNING PICRYPT_DISABLED_WARNING
#endif #endif
return hash; return hash;
}
PIByteArray PICrypt::hash(const PIByteArray & data) {
PIByteArray hash;
#ifdef PIP_CRYPT
if (!init()) return hash;
hash.resize(crypto_generichash_BYTES);
crypto_generichash(hash.data(), hash.size(), data.data(), data.size(), (const uchar*)hash_def_key, sizeof(hash_def_key) - 1);
#else
PICRYPT_DISABLED_WARNING
#endif
return hash;
} }

3
src_main/crypt/picrypt.h
View File

@@ -54,6 +54,9 @@ public:
//! Generate hash from keyphrase "secret", may be used as a key for encryption //! Generate hash from keyphrase "secret", may be used as a key for encryption
static PIByteArray hash(const PIString & secret); static PIByteArray hash(const PIString & secret);
//! Generate hash from bytearray
static PIByteArray hash(const PIByteArray & data);
//! Generate short hash from string "s", may be used for hash table //! Generate short hash from string "s", may be used for hash table
static ullong shorthash(const PIString & s, PIByteArray key = PIByteArray()); static ullong shorthash(const PIString & s, PIByteArray key = PIByteArray());