lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-05 20:55:46 +03:00
Code Activity

Check for ecdsa with openssl, added log_warning

Browse Source
This commit is contained in:
Aris Adamantiadis
2011-06-11 13:13:42 +02:00
parent fb0f125351
commit b54e8cdae5
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ConfigureChecks.cmake
View File

@@ -68,6 +68,9 @@ check_include_file(openssl/blowfish.h HAVE_OPENSSL_BLOWFISH_H)
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS}) set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
check_include_file(openssl/des.h HAVE_OPENSSL_DES_H) 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) if (CMAKE_HAVE_PTHREAD_H)
set(HAVE_PTHREAD_H 1) set(HAVE_PTHREAD_H 1)
endif (CMAKE_HAVE_PTHREAD_H) endif (CMAKE_HAVE_PTHREAD_H)
@@ -127,6 +130,7 @@ set(LIBSSH_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "libssh
# LIBRARIES # LIBRARIES
if (OPENSSL_FOUND) if (OPENSSL_FOUND)
set(HAVE_LIBCRYPTO 1) set(HAVE_LIBCRYPTO 1)
endif (OPENSSL_FOUND) endif (OPENSSL_FOUND)
if (GCRYPT_FOUND) if (GCRYPT_FOUND)

5
include/libssh/libssh.h
View File

@@ -263,9 +263,9 @@ enum {
/** No logging at all /** No logging at all
*/ */
SSH_LOG_NOLOG=0, SSH_LOG_NOLOG=0,
/** Only rare and noteworthy events /** Only warnings
*/ */
SSH_LOG_RARE, SSH_LOG_WARNING,
/** High level protocol information /** High level protocol information
*/ */
SSH_LOG_PROTOCOL, SSH_LOG_PROTOCOL,
@@ -277,6 +277,7 @@ enum {
SSH_LOG_FUNCTIONS SSH_LOG_FUNCTIONS
}; };
/** @} */ /** @} */
#define SSH_LOG_RARE SSH_LOG_WARNING
enum ssh_options_e { enum ssh_options_e {
SSH_OPTIONS_HOST, SSH_OPTIONS_HOST,