diff options
| -rw-r--r-- | ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | include/libssh/libssh.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 0a555a9..435098f 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -68,6 +68,9 @@ check_include_file(openssl/blowfish.h HAVE_OPENSSL_BLOWFISH_H) set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS}) check_include_file(openssl/des.h HAVE_OPENSSL_DES_H) +set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS}) +check_include_file(openssl/ecdh.h HAVE_OPENSSL_ECDH_H) + if (CMAKE_HAVE_PTHREAD_H) set(HAVE_PTHREAD_H 1) endif (CMAKE_HAVE_PTHREAD_H) @@ -127,6 +130,7 @@ set(LIBSSH_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "libssh # LIBRARIES if (OPENSSL_FOUND) set(HAVE_LIBCRYPTO 1) + endif (OPENSSL_FOUND) if (GCRYPT_FOUND) diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index bfd6815..425be1a 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -263,9 +263,9 @@ enum { /** No logging at all */ SSH_LOG_NOLOG=0, - /** Only rare and noteworthy events + /** Only warnings */ - SSH_LOG_RARE, + SSH_LOG_WARNING, /** High level protocol information */ SSH_LOG_PROTOCOL, @@ -277,6 +277,7 @@ enum { SSH_LOG_FUNCTIONS }; /** @} */ +#define SSH_LOG_RARE SSH_LOG_WARNING enum ssh_options_e { SSH_OPTIONS_HOST, |