Rename ssh.h -> deucessh.h, clean up includes

All consumers are expected to only #include deucessh.h now.  Individual
headers should not be included.

src/ssh/client.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <threads.h>
 
-#include "ssh.h"
+#include "deucessh.h"
 #include "enc/none.h"
 #include "mac/none.h"
 #include "comp/none.h"

src/ssh/ssh.h → src/ssh/deucessh.h

@@ -56,4 +56,7 @@ void deuce_ssh_session_cleanup(deuce_ssh_session_t sess);
 
 int deuce_ssh_transport_set_callbacks(deuce_ssh_transport_io_cb_t tx, deuce_ssh_transport_io_cb_t rx, deuce_ssh_transport_rxline_cb_t rx_line, deuce_ssh_transport_extra_line_cb_t extra_line_cb);
 
+#include "ssh-arch.h"
+#include "ssh-trans.h"
+
 #endif

src/ssh/ssh-arch.c

@@ -3,8 +3,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "ssh.h"
-#include "ssh-arch.h"
+#include "deucessh.h"
 
 /*
  * Required by parse functions

src/ssh/ssh-arch.h

@@ -3,6 +3,10 @@
 #ifndef DEUCE_SSH_ARCH_H
 #define DEUCE_SSH_ARCH_H
 
+#ifndef DEUCE_SSH_H
+#error Only include deucessh.h, do not directly include this file.
+#endif
+
 #include <inttypes.h>
 #include <stdbool.h>
 

src/ssh/ssh-trans.c

@@ -2,8 +2,7 @@
 #include <string.h>
 #include <threads.h>
 
-#include "ssh.h"
-#include "ssh-trans.h"
+#include "deucessh.h"
 
 typedef struct deuce_ssh_transport_global_config {
 	atomic_bool used;
@@ -183,20 +182,35 @@ deuce_ssh_transport_cleanup(deuce_ssh_session_t sess)
 			sess->trans->key_algo_selected->cleanup(sess);
 		sess->trans->key_algo_selected = NULL;
 	}
-	if (sess->trans->enc_selected) {
-		if (sess->trans->enc_selected->cleanup != NULL)
-			sess->trans->enc_selected->cleanup(sess);
-		sess->trans->enc_selected = NULL;
+	if (sess->trans->enc_c2s_selected) {
+		if (sess->trans->enc_c2s_selected->cleanup != NULL)
+			sess->trans->enc_c2s_selected->cleanup(sess);
+		sess->trans->enc_c2s_selected = NULL;
 	}
-	if (sess->trans->mac_selected) {
-		if (sess->trans->mac_selected->cleanup != NULL)
-			sess->trans->mac_selected->cleanup(sess);
-		sess->trans->mac_selected = NULL;
+	if (sess->trans->enc_s2c_selected) {
+		if (sess->trans->enc_s2c_selected->cleanup != NULL)
+			sess->trans->enc_s2c_selected->cleanup(sess);
+		sess->trans->enc_s2c_selected = NULL;
 	}
-	if (sess->trans->comp_selected) {
-		if (sess->trans->comp_selected->cleanup != NULL)
-			sess->trans->comp_selected->cleanup(sess);
-		sess->trans->comp_selected = NULL;
+	if (sess->trans->mac_c2s_selected) {
+		if (sess->trans->mac_c2s_selected->cleanup != NULL)
+			sess->trans->mac_c2s_selected->cleanup(sess);
+		sess->trans->mac_c2s_selected = NULL;
+	}
+	if (sess->trans->mac_s2c_selected) {
+		if (sess->trans->mac_s2c_selected->cleanup != NULL)
+			sess->trans->mac_s2c_selected->cleanup(sess);
+		sess->trans->mac_s2c_selected = NULL;
+	}
+	if (sess->trans->comp_c2s_selected) {
+		if (sess->trans->comp_c2s_selected->cleanup != NULL)
+			sess->trans->comp_c2s_selected->cleanup(sess);
+		sess->trans->comp_c2s_selected = NULL;
+	}
+	if (sess->trans->comp_s2c_selected) {
+		if (sess->trans->comp_s2c_selected->cleanup != NULL)
+			sess->trans->comp_s2c_selected->cleanup(sess);
+		sess->trans->comp_s2c_selected = NULL;
 	}
 
 	sess->remote_software_id_string_sz = 0;
@@ -231,9 +245,12 @@ deuce_ssh_transport_init(deuce_ssh_session_t sess)
 	}
 	sess->trans->kex_selected = NULL;
 	sess->trans->key_algo_selected = NULL;
-	sess->trans->enc_selected = NULL;
-	sess->trans->mac_selected = NULL;
-	sess->trans->comp_selected = NULL;
+	sess->trans->enc_c2s_selected = NULL;
+	sess->trans->enc_s2c_selected = NULL;
+	sess->trans->mac_c2s_selected = NULL;
+	sess->trans->mac_s2c_selected = NULL;
+	sess->trans->comp_c2s_selected = NULL;
+	sess->trans->comp_s2c_selected = NULL;
 	sess->trans->transport_thread = thrd;
 	return 0;
 }

src/ssh/ssh-trans.h

 // RFC-4253
 
-#include "ssh.h"
-#include "ssh-arch.h"
-
 #ifndef DEUCE_SSH_TRANS_H
 #define DEUCE_SSH_TRANS_H
 
+#ifndef DEUCE_SSH_H
+#error Only include deucessh.h, do not directly include this file.
+#endif
+
 /* Transport layer generic */
 #define SSH_MSG_DISCONNECT      UINT8_C(1)
 #define SSH_MSG_IGNORE          UINT8_C(2)

src/ssh/ssh.c

-#include "ssh.h"
-#include "ssh-trans.h"
+#include "deucessh.h"
 
 int
 deuce_ssh_session_init(deuce_ssh_session_t sess)