Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
index dfcd7743bece4f809c894179223b801c1ef2de7f,76e51b4183908f0a40bef61c7004049f157b90a6..b6159755ad8399822ddac77fa3b96f4566ce95e0
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -14,23 -14,6 +14,20 @@@ else(
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DL_ENDIAN")
  endif()
  
- set(GOST_INCLUDE_DIRECTORIES "${OPENSSL_PATH}/include" "${OPENSSL_PATH}/crypto/include")
- 
- set(GOST_LINK_DIRECTORIES "${OPENSSL_PATH}")
 +
 +# module linker flags
- SET (CMAKE_MODULE_LINKER_FLAGS "-L${OPENSSL_PATH}" "-L${OPENSSL_PATH}/lib" $ENV{LDFLAGS}
-      CACHE STRING "Flags used by the linker during the creation of modules.")
++//SET (CMAKE_MODULE_LINKER_FLAGS "-L${OPENSSL_PATH}" "-L${OPENSSL_PATH}/lib" $ENV{LDFLAGS}
++//     CACHE STRING "Flags used by the linker during the creation of modules.")
 +# exe linker flags
 +SET (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS_INIT} $ENV{LDFLAGS}
 +     CACHE STRING "Flags used by the linker during the creation of executables.")
 +# shared lib linker flags
 +SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS_INIT} $ENV{LDFLAGS}
 +     CACHE STRING "Flags used by the linker during the creation of shared libraries.")
 +
 +
 +include_directories("${GOST_INCLUDE_DIRECTORIES}")
 +
  set(BIN_DIRECTORY bin)
  
  set(OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/${BIN_DIRECTORY})