libnetconf2 UPDATE merge SSH and TLS req into one
In this commit I made the changes that if you want to use TLS, you have
to have both OpenSSL and libssh installed and viceversa. Set the minimum
required OpenSSL version to 3.0 and 0.9.5 for libssh.
diff --git a/src/session_client_ch.h b/src/session_client_ch.h
index 33ea39c..a19b526 100644
--- a/src/session_client_ch.h
+++ b/src/session_client_ch.h
@@ -22,15 +22,15 @@
#include <libyang/libyang.h>
-#ifdef NC_ENABLED_SSH
+#ifdef NC_ENABLED_SSH_TLS
# include <libssh/libssh.h>
-#endif
+#endif /* NC_ENABLED_SSH_TLS */
#include "messages_client.h"
#include "netconf.h"
#include "session.h"
-#if defined (NC_ENABLED_SSH) || defined (NC_ENABLED_TLS)
+#ifdef NC_ENABLED_SSH_TLS
/**
* @defgroup client_ch Client-side Call Home
@@ -55,10 +55,6 @@
/** @} Client-side Call Home */
-#endif /* NC_ENABLED_SSH || NC_ENABLED_TLS */
-
-#ifdef NC_ENABLED_SSH
-
/**
* @defgroup client_ch_ssh Client-side Call Home on SSH
* @ingroup client_ch
@@ -257,10 +253,6 @@
/** @} Client-side Call Home on SSH */
-#endif /* NC_ENABLED_SSH */
-
-#ifdef NC_ENABLED_TLS
-
/**
* @defgroup client_ch_tls Client-side Call Home on TLS
* @ingroup client_ch
@@ -353,7 +345,7 @@
/** @} Client-side Call Home on TLS */
-#endif /* NC_ENABLED_TLS */
+#endif /* NC_ENABLED_SSH_TLS */
#ifdef __cplusplus
}