Move the SSH implementation into its own subdirectory.

This clears up another large pile of clutter at the top level, and in
the process, allows me to rename source files to things that don't all
have that annoying 'ssh' prefix at the top.

CMakeLists.txt

@@ -44,38 +44,12 @@ add_library(guiterminal STATIC
 add_library(noterminal STATIC
   noterm.c ldisc.c)
 
-add_library(sshcommon OBJECT
-  ssh1bpp.c ssh1censor.c
-  ssh1connection.c ssh1login.c ssh2bpp-bare.c ssh2bpp.c ssh2censor.c
-  ssh2connection.c ssh2transhk.c ssh2transport.c ssh2userauth.c
-  sshcommon.c sshcrcda.c sshgssc.c sshpubk.c sshrand.c
-  sshverstring.c sshzlib.c
-  pgssapi.c portfwd.c x11fwd.c)
-
-add_library(sftpcommon OBJECT
-  sftpcommon.c)
-
 add_library(all-backends OBJECT
   pinger.c)
 
-add_library(sshclient STATIC
-  ssh1connection-client.c ssh2connection-client.c ssh2kex-client.c
-  sshshare.c ssh.c
-  mainchan.c agentf.c
-  $<TARGET_OBJECTS:sshcommon>
-  $<TARGET_OBJECTS:all-backends>
-  $<TARGET_OBJECTS:logging>)
-
-add_library(sshserver STATIC
-  ssh1connection-server.c ssh1login-server.c ssh2connection-server.c
-  ssh2kex-server.c ssh2userauth-server.c sshserver.c
-  sesschan.c
-  sftpserver.c
-  $<TARGET_OBJECTS:sftpcommon>
-  $<TARGET_OBJECTS:sshcommon>)
-
 add_library(sftpclient STATIC
-  psftpcommon.c sftp.c $<TARGET_OBJECTS:sftpcommon>)
+  psftpcommon.c)
+add_subdirectory(ssh)
 
 add_library(otherbackends STATIC
   telnet.c rlogin.c raw.c supdup.c
@@ -83,7 +57,7 @@ add_library(otherbackends STATIC
   $<TARGET_OBJECTS:logging>)
 
 add_executable(testcrypt
-  testcrypt.c sshpubk.c sshcrcda.c)
+  testcrypt.c sshpubk.c ssh/crc-attack-detector.c)
 target_link_libraries(testcrypt
   keygen crypto utils ${platform_libraries})
 

crypto/diffie-hellman.c

@@ -96,7 +96,7 @@ const ssh_kexes ssh_diffiehellman_gex = { lenof(gex_list), gex_list };
  * Kerberos v5.
  *
  * (The same encoded OID, minus the two-byte DER header, is defined in
- * pgssapi.c as GSS_MECH_KRB5.)
+ * ssh/pgssapi.c as GSS_MECH_KRB5.)
  */
 #define GSS_KRB5_OID_HASH "toWM5Slw5Ew8Mqkay+al2g=="
 

mpunsafe.c

@@ -10,7 +10,7 @@
 #include "crypto/mpint_i.h"
 
 /*
- * This global symbol is also defined in ssh2kex-client.c, to ensure
+ * This global symbol is also defined in ssh/kex2-client.c, to ensure
  * that these unsafe non-constant-time mp_int functions can't end up
  * accidentally linked in to any PuTTY tool that actually makes an SSH
  * client connection.

pscp.c

@@ -22,7 +22,7 @@
 #include "putty.h"
 #include "psftp.h"
 #include "ssh.h"
-#include "sftp.h"
+#include "ssh/sftp.h"
 #include "storage.h"
 
 static bool list = false;

psftp.c

@@ -12,7 +12,7 @@
 #include "psftp.h"
 #include "storage.h"
 #include "ssh.h"
-#include "sftp.h"
+#include "ssh/sftp.h"
 
 const char *const appname = "PSFTP";
 

psftpcommon.c

@@ -8,7 +8,7 @@
 #include <string.h>
 
 #include "putty.h"
-#include "sftp.h"
+#include "ssh/sftp.h"
 #include "psftp.h"
 
 #define MAX_NAMES_MEMORY ((size_t)8 << 20)

psocks.c

@@ -9,7 +9,7 @@
 #include "putty.h"
 #include "misc.h"
 #include "ssh.h"
-#include "sshchan.h"
+#include "ssh/channel.h"
 #include "psocks.h"
 
 /*

putty.h

@@ -326,13 +326,13 @@ typedef enum {
     /*
      * Send a POSIX-style signal. (Useful in SSH and also pterm.)
      *
-     * We use the master list in sshsignals.h to define these enum
+     * We use the master list in ssh/signal-list.h to define these enum
      * values, which will come out looking like names of the form
      * SS_SIGABRT, SS_SIGINT etc.
      */
     #define SIGNAL_MAIN(name, text) SS_SIG ## name,
     #define SIGNAL_SUB(name) SS_SIG ## name,
-    #include "sshsignals.h"
+    #include "ssh/signal-list.h"
     #undef SIGNAL_MAIN
     #undef SIGNAL_SUB
 
@@ -356,7 +356,7 @@ struct SessionSpecial {
     int arg;
 };
 
-/* Needed by both sshchan.h and sshppl.h */
+/* Needed by both ssh/channel.h and ssh/ppl.h */
 typedef void (*add_special_fn_t)(
     void *ctx, const char *text, SessionSpecialCode code, int arg);
 
@@ -1925,7 +1925,7 @@ extern const struct BackendVtable rlogin_backend;
 extern const struct BackendVtable telnet_backend;
 
 /*
- * Exports from ssh.c.
+ * Exports from ssh/ssh.c.
  */
 extern const struct BackendVtable ssh_backend;
 extern const struct BackendVtable sshconn_backend;

settings.c

@@ -8,8 +8,8 @@
 #include "putty.h"
 #include "storage.h"
 #ifndef NO_GSSAPI
-#include "sshgssc.h"
+#include "ssh/gssc.h"
-#include "sshgss.h"
+#include "ssh/gss.h"
 #endif
 
 

ssh.h

@@ -1612,7 +1612,7 @@ enum {
     /* TTY modes with opcodes defined consistently in the SSH specs. */
     #define TTYMODE_CHAR(name, val, index) SSH_TTYMODE_##name = val,
     #define TTYMODE_FLAG(name, val, field, mask) SSH_TTYMODE_##name = val,
-    #include "sshttymodes.h"
+    #include "ssh/ttymode-list.h"
     #undef TTYMODE_CHAR
     #undef TTYMODE_FLAG
 

ssh/CMakeLists.txt

@@ -0,0 +1,51 @@
+add_library(sshcommon OBJECT
+  bpp1.c
+  bpp2.c
+  bpp-bare.c
+  censor1.c
+  censor2.c
+  common.c
+  connection1.c
+  connection2.c
+  crc-attack-detector.c
+  gssc.c
+  login1.c
+  pgssapi.c
+  portfwd.c
+  ../sshpubk.c
+  ../sshrand.c
+  transient-hostkey-cache.c
+  transport2.c
+  verstring.c
+  x11fwd.c
+  zlib.c)
+
+add_library(sftpcommon OBJECT sftpcommon.c)
+
+add_library(sshclient STATIC
+  agentf.c
+  connection1-client.c
+  connection2-client.c
+  kex2-client.c
+  mainchan.c
+  sharing.c
+  ssh.c
+  userauth2-client.c
+  $<TARGET_OBJECTS:sshcommon>
+  $<TARGET_OBJECTS:all-backends>
+  $<TARGET_OBJECTS:logging>)
+
+add_library(sshserver STATIC
+  connection1-server.c
+  connection2-server.c
+  kex2-server.c
+  login1-server.c
+  server.c
+  sesschan.c
+  sftpserver.c
+  userauth2-server.c
+  $<TARGET_OBJECTS:sftpcommon>
+  $<TARGET_OBJECTS:sshcommon>)
+
+add_sources_from_current_dir(sftpclient sftp.c)
+target_sources(sftpclient PRIVATE $<TARGET_OBJECTS:sftpcommon>)

ssh/agentf.c

@@ -9,7 +9,7 @@
 #include "putty.h"
 #include "ssh.h"
 #include "pageant.h"
-#include "sshchan.h"
+#include "channel.h"
 
 typedef struct agentf {
     SshChannel *c;

ssh/bpp-bare.c

@@ -7,7 +7,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
 #include "sshcr.h"
 
 struct ssh2_bare_bpp_state {
@@ -30,9 +30,9 @@ static const BinaryPacketProtocolVtable ssh2_bare_bpp_vtable = {
     .handle_input = ssh2_bare_bpp_handle_input,
     .handle_output = ssh2_bare_bpp_handle_output,
     .new_pktout = ssh2_bare_bpp_new_pktout,
-    .queue_disconnect = ssh2_bpp_queue_disconnect, /* in sshcommon.c */
+    .queue_disconnect = ssh2_bpp_queue_disconnect, /* in common.c */
 
-    /* packet size limit, per protocol spec in sshshare.c comment */
+    /* packet size limit, per protocol spec in sharing.c comment */
     .packet_size_limit = 0x4000,
 };
 

ssh/bpp1.c

@@ -6,7 +6,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
 #include "sshcr.h"
 
 struct ssh1_bpp_state {

ssh/bpp2.c

@@ -6,7 +6,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
 #include "sshcr.h"
 
 struct ssh2_bpp_direction {
@@ -54,7 +54,7 @@ static const BinaryPacketProtocolVtable ssh2_bpp_vtable = {
     .handle_input = ssh2_bpp_handle_input,
     .handle_output = ssh2_bpp_handle_output,
     .new_pktout = ssh2_bpp_new_pktout,
-    .queue_disconnect = ssh2_bpp_queue_disconnect, /* in sshcommon.c */
+    .queue_disconnect = ssh2_bpp_queue_disconnect, /* in common.c */
     .packet_size_limit = 0xFFFFFFFF, /* no special limit for this bpp */
 };
 

ssh/common.c

@@ -9,9 +9,9 @@
 #include "putty.h"
 #include "mpint.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
 
 /* ----------------------------------------------------------------------
  * Implementation of PacketQueue.
@@ -407,7 +407,7 @@ struct ssh_ttymodes get_ttymodes_from_conf(Seat *seat, Conf *conf)
     } modes_names_types[] = {
         #define TTYMODE_CHAR(name, val, index) { #name, val, TYPE_CHAR },
         #define TTYMODE_FLAG(name, val, field, mask) { #name, val, TYPE_BOOL },
-        #include "sshttymodes.h"
+        #include "ttymode-list.h"
         #undef TTYMODE_CHAR
         #undef TTYMODE_FLAG
     };

ssh/connection1-client.c

@@ -6,11 +6,11 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
 #include "sshcr.h"
-#include "ssh1connection.h"
+#include "connection1.h"
 
 void ssh1_connection_direction_specific_setup(
     struct ssh1_connection_state *s)

ssh/connection1-server.c

@@ -6,12 +6,12 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
 #include "sshcr.h"
-#include "ssh1connection.h"
+#include "connection1.h"
-#include "sshserver.h"
+#include "server.h"
 
 static size_t ssh1sesschan_write(SshChannel *c, bool is_stderr,
                                  const void *, size_t);

ssh/connection1.c

@@ -7,11 +7,11 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
 #include "sshcr.h"
-#include "ssh1connection.h"
+#include "connection1.h"
 
 static int ssh1_rportfwd_cmp(void *av, void *bv)
 {

ssh/connection2-client.c

@@ -6,11 +6,11 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
 #include "sshcr.h"
-#include "ssh2connection.h"
+#include "connection2.h"
 
 static ChanopenResult chan_open_x11(
     struct ssh2_connection_state *s, SshChannel *sc,

ssh/connection2-server.c

@@ -6,12 +6,12 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
 #include "sshcr.h"
-#include "ssh2connection.h"
+#include "connection2.h"
-#include "sshserver.h"
+#include "server.h"
 
 void ssh2connection_server_configure(
     PacketProtocolLayer *ppl, const SftpServerVtable *sftpserver_vt,

ssh/connection2.c

@@ -6,11 +6,11 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
 #include "sshcr.h"
-#include "ssh2connection.h"
+#include "connection2.h"
 
 static void ssh2_connection_free(PacketProtocolLayer *);
 static void ssh2_connection_process_queue(PacketProtocolLayer *);
@@ -391,7 +391,7 @@ static bool ssh2_connection_filter_queue(struct ssh2_connection_state *s)
                  * This channel-open request needs to go to a
                  * connection-sharing downstream, so abandon our own
                  * channel-open procedure and just pass the message on
-                 * to sshshare.c.
+                 * to sharing.c.
                  */
                 share_got_pkt_from_server(
                     chanopen_result.u.downstream.share_ctx, pktin->type,

ssh/gss.h

@@ -32,7 +32,7 @@ typedef gss_name_t Ssh_gss_name;
 
 #define GSS_DEF_REKEY_MINS 2    /* Default minutes between GSS cache checks */
 
-/* Functions, provided by either wingss.c or sshgssc.c */
+/* Functions, provided by either wingss.c or gssc.c */
 
 struct ssh_gss_library;
 

ssh/gssc.c

@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <limits.h>
-#include "sshgssc.h"
+#include "gssc.h"
 #include "misc.h"
 
 #ifndef NO_GSSAPI

ssh/gssc.h

@@ -4,7 +4,7 @@
 #ifndef NO_GSSAPI
 
 #include "pgssapi.h"
-#include "sshgss.h"
+#include "gss.h"
 
 typedef struct gssapi_ssh_gss_ctx {
     OM_uint32 maj_stat;

ssh/kex2-client.c

@@ -6,11 +6,11 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
 #include "sshcr.h"
 #include "storage.h"
-#include "ssh2transport.h"
+#include "transport2.h"
 #include "mpint.h"
 
 /*

ssh/kex2-server.c

@@ -6,13 +6,13 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
 #include "sshcr.h"
-#include "sshserver.h"
+#include "server.h"
 #include "sshkeygen.h"
 #include "storage.h"
-#include "ssh2transport.h"
+#include "transport2.h"
 #include "mpint.h"
 
 void ssh2_transport_provide_hostkeys(PacketProtocolLayer *ppl,

ssh/login1-server.c

@@ -7,10 +7,10 @@
 #include "putty.h"
 #include "mpint.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
 #include "sshcr.h"
-#include "sshserver.h"
+#include "server.h"
 #include "sshkeygen.h"
 
 struct ssh1_login_server_state {

ssh/login1.c

@@ -8,8 +8,8 @@
 #include "putty.h"
 #include "ssh.h"
 #include "mpint.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
 #include "sshcr.h"
 
 typedef struct agent_key {

ssh/mainchan.c

@@ -8,8 +8,8 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
 
 static void mainchan_free(Channel *chan);
 static void mainchan_open_confirmation(Channel *chan);
@@ -433,7 +433,7 @@ static bool mainchan_rcvd_exit_signal(
             exitcode = 128 + SIG ## s;
     #define SIGNAL_MAIN(s, text) SIGNAL_SUB(s)
     #define SIGNALS_LOCAL_ONLY
-    #include "sshsignals.h"
+    #include "signal-list.h"
     #undef SIGNAL_SUB
     #undef SIGNAL_MAIN
     #undef SIGNALS_LOCAL_ONLY
@@ -473,7 +473,7 @@ void mainchan_get_specials(
     #define SIGNAL_MAIN(name, desc) \
     add_special(ctx, "SIG" #name " (" desc ")", SS_SIG ## name, 0);
     #define SIGNAL_SUB(name)
-    #include "sshsignals.h"
+    #include "signal-list.h"
     #undef SIGNAL_MAIN
     #undef SIGNAL_SUB
 
@@ -482,7 +482,7 @@ void mainchan_get_specials(
     #define SIGNAL_MAIN(name, desc)
     #define SIGNAL_SUB(name) \
     add_special(ctx, "SIG" #name, SS_SIG ## name, 0);
-    #include "sshsignals.h"
+    #include "signal-list.h"
     #undef SIGNAL_MAIN
     #undef SIGNAL_SUB
 
@@ -494,7 +494,7 @@ static const char *ssh_signal_lookup(SessionSpecialCode code)
     #define SIGNAL_SUB(name) \
     if (code == SS_SIG ## name) return #name;
     #define SIGNAL_MAIN(name, desc) SIGNAL_SUB(name)
-    #include "sshsignals.h"
+    #include "signal-list.h"
     #undef SIGNAL_MAIN
     #undef SIGNAL_SUB
 

ssh/portfwd.c

@@ -8,7 +8,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshchan.h"
+#include "channel.h"
 
 /*
  * Enumeration of values that live in the 'socks_state' field of

ssh/ppl.h

@@ -147,7 +147,7 @@ void ssh_ppl_user_output_string_and_free(PacketProtocolLayer *ppl, char *text);
 ptrlen ssh2_transport_get_session_id(PacketProtocolLayer *ssh2_transport_ptr);
 void ssh2_transport_notify_auth_done(PacketProtocolLayer *ssh2_transport_ptr);
 
-/* Shared method between ssh2 layers (defined in ssh2transport.c) to
+/* Shared method between ssh2 layers (defined in transport2.c) to
  * handle the common packets between login and connection: DISCONNECT,
  * DEBUG and IGNORE. Those messages are handled by the ssh2transport
  * layer if we have one, but in bare ssh2-connection mode they have to

ssh/scpserver.c

@@ -9,7 +9,7 @@
 #include "putty.h"
 #include "ssh.h"
 #include "sshcr.h"
-#include "sshchan.h"
+#include "channel.h"
 #include "sftp.h"
 
 /*

ssh/server.c

@@ -7,13 +7,13 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
-#include "sshserver.h"
+#include "server.h"
 #ifndef NO_GSSAPI
-#include "sshgssc.h"
+#include "gssc.h"
-#include "sshgss.h"
+#include "gss.h"
 #endif
 
 struct Ssh { int dummy; };

ssh/sesschan.c

@@ -9,8 +9,8 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshchan.h"
+#include "channel.h"
-#include "sshserver.h"
+#include "server.h"
 #include "sftp.h"
 
 struct agentfwd {
@@ -575,7 +575,7 @@ bool sesschan_send_signal(Channel *chan, ptrlen signame)
     #define SIGNAL_SUB(name) \
         if (ptrlen_eq_string(signame, #name)) code = SS_SIG ## name;
     #define SIGNAL_MAIN(name, text) SIGNAL_SUB(name)
-    #include "sshsignals.h"
+    #include "signal-list.h"
     #undef SIGNAL_MAIN
     #undef SIGNAL_SUB
 

ssh/ssh.c

@@ -16,12 +16,12 @@
 #include "marshal.h"
 #include "ssh.h"
 #include "sshcr.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
-#include "sshchan.h"
+#include "channel.h"
 #ifndef NO_GSSAPI
-#include "sshgssc.h"
+#include "gssc.h"
-#include "sshgss.h"
+#include "gss.h"
 #define MIN_CTXT_LIFETIME 5     /* Avoid rekey with short lifetime (seconds) */
 #define GSS_KEX_CAPABLE (1<<0)  /* Can do GSS KEX */
 #define GSS_CRED_UPDATED (1<<1) /* Cred updated since previous delegation */

ssh/transport2.c

@@ -6,12 +6,12 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
 #include "sshcr.h"
-#include "sshserver.h"
+#include "server.h"
 #include "storage.h"
-#include "ssh2transport.h"
+#include "transport2.h"
 #include "mpint.h"
 
 const struct ssh_signkey_with_user_pref_id ssh2_hostkey_algs[] = {

ssh/transport2.h

@@ -6,8 +6,8 @@
 #define PUTTY_SSH2TRANSPORT_H
 
 #ifndef NO_GSSAPI
-#include "sshgssc.h"
+#include "gssc.h"
-#include "sshgss.h"
+#include "gss.h"
 #define MIN_CTXT_LIFETIME 5     /* Avoid rekey with short lifetime (seconds) */
 #define GSS_KEX_CAPABLE (1<<0)  /* Can do GSS KEX */
 #define GSS_CRED_UPDATED (1<<1) /* Cred updated since previous delegation */

ssh/userauth2-client.c

@@ -7,13 +7,13 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
 #include "sshcr.h"
 
 #ifndef NO_GSSAPI
-#include "sshgssc.h"
+#include "gssc.h"
-#include "sshgss.h"
+#include "gss.h"
 #endif
 
 #define BANNER_LIMIT 131072

ssh/userauth2-server.c

@@ -7,14 +7,14 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
-#include "sshppl.h"
+#include "ppl.h"
 #include "sshcr.h"
-#include "sshserver.h"
+#include "server.h"
 
 #ifndef NO_GSSAPI
-#include "sshgssc.h"
+#include "gssc.h"
-#include "sshgss.h"
+#include "gss.h"
 #endif
 
 struct ssh2_userauth_server_state {

ssh/verstring.c

@@ -8,7 +8,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshbpp.h"
+#include "bpp.h"
 #include "sshcr.h"
 
 #define PREFIX_MAXLEN 64

ssh/x11fwd.c

@@ -9,7 +9,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshchan.h"
+#include "channel.h"
 #include "tree234.h"
 
 struct XDMSeen {

testzlib.c

@@ -1,5 +1,5 @@
 /*
- * Main program to compile sshzlib.c into a zlib decoding tool.
+ * Main program to compile ssh/zlib.c into a zlib decoding tool.
  *
  * This is potentially a handy tool in its own right for picking apart
  * Zip files or PDFs or PNGs, because it accepts the bare Deflate

unix/CMakeLists.txt

@@ -88,7 +88,7 @@ add_executable(psocks
   ${CMAKE_SOURCE_DIR}/psocks.c
   ${CMAKE_SOURCE_DIR}/norand.c
   ${CMAKE_SOURCE_DIR}/nocproxy.c
-  ${CMAKE_SOURCE_DIR}/portfwd.c
+  ${CMAKE_SOURCE_DIR}/ssh/portfwd.c
   uxnogtk.c)
 target_link_libraries(psocks
   eventloop console network utils)
@@ -97,7 +97,7 @@ add_executable(psusan
   uxpsusan.c
   ${CMAKE_SOURCE_DIR}/be_none.c
   ${CMAKE_SOURCE_DIR}/nogss.c
-  ${CMAKE_SOURCE_DIR}/scpserver.c
+  ${CMAKE_SOURCE_DIR}/ssh/scpserver.c
   uxnogtk.c
   uxpty.c)
 target_link_libraries(psusan
@@ -130,13 +130,13 @@ target_link_libraries(testsc crypto utils)
 
 add_executable(testzlib
   ${CMAKE_SOURCE_DIR}/testzlib.c
-  ${CMAKE_SOURCE_DIR}/sshzlib.c)
+  ${CMAKE_SOURCE_DIR}/ssh/zlib.c)
 target_link_libraries(testzlib utils)
 
 add_executable(uppity
   uxserver.c
   ${CMAKE_SOURCE_DIR}/be_none.c
-  ${CMAKE_SOURCE_DIR}/scpserver.c
+  ${CMAKE_SOURCE_DIR}/ssh/scpserver.c
   uxnogtk.c
   uxpty.c
   ${CMAKE_SOURCE_DIR}/nogss.c)
@@ -161,7 +161,7 @@ if(GTK_FOUND)
     gtkask.c
     ux_x11.c
     uxnoise.c
-    ${CMAKE_SOURCE_DIR}/x11fwd.c)
+    ${CMAKE_SOURCE_DIR}/ssh/x11fwd.c)
   target_link_libraries(pageant
     guimisc eventloop console agent settings network crypto utils
     ${GTK_LIBRARIES})

unix/platform.h

@@ -67,7 +67,7 @@ struct FontSpec *fontspec_new(const char *name);
 
 extern const struct BackendVtable pty_backend;
 
-#define BROKEN_PIPE_ERROR_CODE EPIPE   /* used in sshshare.c */
+#define BROKEN_PIPE_ERROR_CODE EPIPE   /* used in ssh/sharing.c */
 
 /*
  * Under GTK, we send MA_CLICK _and_ MA_2CLK, or MA_CLICK _and_

unix/uxgss.c

@@ -1,8 +1,8 @@
 #include "putty.h"
 #ifndef NO_GSSAPI
-#include "pgssapi.h"
+#include "ssh/pgssapi.h"
-#include "sshgss.h"
+#include "ssh/gss.h"
-#include "sshgssc.h"
+#include "ssh/gssc.h"
 
 /* Unix code to set up the GSSAPI library list. */
 

unix/uxpsusan.c

@@ -39,7 +39,7 @@
 #include "putty.h"
 #include "mpint.h"
 #include "ssh.h"
-#include "sshserver.h"
+#include "ssh/server.h"
 
 const char *const appname = "psusan";
 

unix/uxpty.c

@@ -25,7 +25,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshserver.h" /* to check the prototypes of server-needed things */
+#include "ssh/server.h" /* to check the prototypes of server-needed things */
 #include "tree234.h"
 
 #ifndef OMIT_UTMP
@@ -828,7 +828,7 @@ static void copy_ttymodes_into_termios(
     }
 
 #define TTYMODES_LOCAL_ONLY   /* omit any that this platform doesn't know */
-#include "sshttymodes.h"
+#include "ssh/ttymode-list.h"
 
 #undef TTYMODES_LOCAL_ONLY
 #undef TTYMODE_CHAR
@@ -1468,7 +1468,7 @@ static void pty_special(Backend *be, SessionSpecialCode code, int arg)
         #define SIGNAL_SUB(name) if (code == SS_SIG ## name) sig = SIG ## name;
         #define SIGNAL_MAIN(name, text) SIGNAL_SUB(name)
         #define SIGNALS_LOCAL_ONLY
-        #include "sshsignals.h"
+        #include "ssh/signal-list.h"
         #undef SIGNAL_SUB
         #undef SIGNAL_MAIN
         #undef SIGNALS_LOCAL_ONLY
@@ -1564,7 +1564,7 @@ ptrlen pty_backend_exit_signame(Backend *be, char **aux_msg)
     }
     #define SIGNAL_MAIN(s, desc) SIGNAL_SUB(s)
     #define SIGNALS_LOCAL_ONLY
-    #include "sshsignals.h"
+    #include "ssh/signal-list.h"
     #undef SIGNAL_MAIN
     #undef SIGNAL_SUB
     #undef SIGNALS_LOCAL_ONLY

unix/uxserver.c

@@ -41,7 +41,7 @@
 #include "putty.h"
 #include "mpint.h"
 #include "ssh.h"
-#include "sshserver.h"
+#include "ssh/server.h"
 
 const char *const appname = "uppity";
 

unix/uxsftpserver.c

@@ -20,8 +20,8 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshserver.h"
+#include "ssh/server.h"
-#include "sftp.h"
+#include "ssh/sftp.h"
 #include "tree234.h"
 
 typedef struct UnixSftpServer UnixSftpServer;

utils/sshutils.c

@@ -8,7 +8,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshchan.h"
+#include "ssh/channel.h"
 
 /* ----------------------------------------------------------------------
  * Centralised standard methods for other channel implementations to

windows/CMakeLists.txt

@@ -111,7 +111,7 @@ add_executable(psocks
   ${CMAKE_SOURCE_DIR}/psocks.c
   ${CMAKE_SOURCE_DIR}/norand.c
   ${CMAKE_SOURCE_DIR}/nocproxy.c
-  ${CMAKE_SOURCE_DIR}/portfwd.c)
+  ${CMAKE_SOURCE_DIR}/ssh/portfwd.c)
 target_link_libraries(psocks
   eventloop console network utils
   ${platform_libraries})

windows/platform.h

@@ -121,7 +121,7 @@ static inline uintmax_t strtoumax(const char *nptr, char **endptr, int base)
 #define strnicmp strncasecmp
 #endif
 
-#define BROKEN_PIPE_ERROR_CODE ERROR_BROKEN_PIPE   /* used in sshshare.c */
+#define BROKEN_PIPE_ERROR_CODE ERROR_BROKEN_PIPE   /* used in ssh/sharing.c */
 
 /*
  * Dynamically linked functions. These come in two flavours:
@@ -261,7 +261,7 @@ void write_aclip(int clipboard, char *, int, bool);
  * couldn't write it if I wanted to, but I haven't bothered), so
  * it's a macro which always returns NULL. With any luck this will
  * cause the compiler to notice it can optimise away the
- * implementation of XDM-AUTHORIZATION-1 in x11fwd.c :-)
+ * implementation of XDM-AUTHORIZATION-1 in ssh/x11fwd.c :-)
  */
 #define sk_getxdmdata(socket, lenp) (NULL)
 

windows/wingss.c

@@ -6,9 +6,9 @@
 #define SECURITY_WIN32
 #include <security.h>
 
-#include "pgssapi.h"
+#include "ssh/pgssapi.h"
-#include "sshgss.h"
+#include "ssh/gss.h"
-#include "sshgssc.h"
+#include "ssh/gssc.h"
 
 #include "misc.h"
 

x11disp.c

@@ -10,7 +10,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "sshchan.h"
+#include "ssh/channel.h"
 #include "tree234.h"
 
 struct X11Display *x11_setup_display(const char *display, Conf *conf,