diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-06-11 13:13:42 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-06-12 19:38:42 +0200 |
| commit | b54e8cdae5b742d98a015fd91708b308848e86e3 (patch) | |
| tree | 5386f2422d3e8a3ae3b7ab9e7c76f0f23122938e | |
| parent | fb0f1253519d5ff76fac1f0fc84077541ca93033 (diff) | |
| download | libssh-b54e8cdae5b742d98a015fd91708b308848e86e3.tar.gz libssh-b54e8cdae5b742d98a015fd91708b308848e86e3.tar.xz libssh-b54e8cdae5b742d98a015fd91708b308848e86e3.zip | |
Check for ecdsa with openssl, added log_warning
| -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 0a555a9e..435098fa 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 bfd68155..425be1a1 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, |