project: Update for 0.9.0 merge.

Author: Sibras

SMP/config.h

@@ -10,6 +10,9 @@
 /* Define to 1 if you have the <glob.h> header file. */
 /* #undef HAVE_GLOB_H */
 
+/* Define to 1 if you have the <valgrind/valgrind.h> header file. */
+/* #undef HAVE_VALGRIND_VALGRIND_H 1
+
 /* Define to 1 if you have the <pty.h> header file. */
 /* #undef HAVE_PTY_H */
 
@@ -87,6 +90,9 @@
 /* Define to 1 if you have the `EVP_aes128_cbc' function. */
 /* #undef HAVE_OPENSSL_EVP_AES_CBC */
 
+/* Define to 1 if you have the `EVP_aes128_gcm' function. */
+/* #undef HAVE_OPENSSL_EVP_AES_GCM 1
+
 /* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */
 /* #undef HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK */
 
@@ -96,6 +102,12 @@
 /* Define to 1 if you have the `EVP_CIPHER_CTX_new' function. */
 /* #undef HAVE_OPENSSL_EVP_CIPHER_CTX_NEW */
 
+/* Define to 1 if you have the `EVP_KDF_CTX_new_id' function. */
+/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID 1
+
+/* Define to 1 if you have the `OPENSSL_ia32cap_loc' function. */
+/* #undef HAVE_OPENSSL_IA32CAP_LOC 1
+
 /* Define to 1 if you have the `snprintf' function. */
 /* #undef HAVE_SNPRINTF */
 
@@ -169,6 +181,9 @@
 /* Define to 1 if you have the `SecureZeroMemory' function. */
 #define HAVE_SECURE_ZERO_MEMORY 1
 
+/* Define to 1 if you have the `cmocka_set_test_filter' function. */
+/* #undef HAVE_CMOCKA_SET_TEST_FILTER */
+
 /*************************** LIBRARIES ***************************/
 
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
@@ -183,12 +198,19 @@
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 /* #undef HAVE_PTHREAD */
 
+/* Define to 1 if you have the `cmocka' library (-lcmocka). */
+/* #undef HAVE_CMOCKA */
+
 /**************************** OPTIONS ****************************/
 
 /* #undef HAVE_GCC_THREAD_LOCAL_STORAGE */
 #define HAVE_MSC_THREAD_LOCAL_STORAGE 1
 
 /* #undef HAVE_FALLTHROUGH_ATTRIBUTE */
+/* #undef HAVE_UNUSED_ATTRIBUTE */
+
+/* #undef HAVE_CONSTRUCTOR_ATTRIBUTE */
+/* #undef HAVE_DESTRUCTOR_ATTRIBUTE */
 
 /* #undef HAVE_GCC_VOLATILE_MEMORY_PROTECTION */
 #define HAVE_GCC_NARG_MACRO 1
@@ -210,6 +232,12 @@
 /* Define to 1 if you want to enable server support */
 #define WITH_SERVER 1
 
+/* Define to 1 if you want to enable DH group exchange algorithms */
+#define WITH_GEX 1
+
+/* Define to 1 if you want to enable blowfish cipher support */
+#define WITH_BLOWFISH_CIPHER 1
+
 /* Define to 1 if you want to enable debug output for crypto functions */
 /* #undef DEBUG_CRYPTO */
 
@@ -230,3 +258,7 @@
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 /* #undef WORDS_BIGENDIAN */
+
+#define GLOBAL_BIND_CONFIG ".ssh/libssh_server_config"
+
+#define GLOBAL_CLIENT_CONFIG ".ssh/ssh_config"