From a1e545cfe782dcb0501fa88f6097c764a0fee146 Mon Sep 17 00:00:00 2001
From: Jaime Idolpx <jaime@idolpx.com>
Date: Sat, 1 Nov 2025 02:02:34 -0400
Subject: [PATCH] make libssh into a component

---
 components/libssh/CMakeLists.txt                         | 9 +++++++++
 {lib => components}/libssh/include/libssh/agent.h        | 0
 {lib => components}/libssh/include/libssh/auth.h         | 0
 {lib => components}/libssh/include/libssh/bignum.h       | 0
 {lib => components}/libssh/include/libssh/bind.h         | 0
 {lib => components}/libssh/include/libssh/bind_config.h  | 0
 {lib => components}/libssh/include/libssh/blf.h          | 0
 {lib => components}/libssh/include/libssh/buffer.h       | 0
 {lib => components}/libssh/include/libssh/bytearray.h    | 0
 {lib => components}/libssh/include/libssh/callbacks.h    | 0
 {lib => components}/libssh/include/libssh/chacha.h       | 0
 {lib => components}/libssh/include/libssh/channels.h     | 0
 {lib => components}/libssh/include/libssh/config.h       | 0
 .../libssh/include/libssh/config_parser.h                | 0
 {lib => components}/libssh/include/libssh/crypto.h       | 0
 {lib => components}/libssh/include/libssh/curve25519.h   | 0
 {lib => components}/libssh/include/libssh/dh-gex.h       | 0
 {lib => components}/libssh/include/libssh/dh.h           | 0
 {lib => components}/libssh/include/libssh/ecdh.h         | 0
 {lib => components}/libssh/include/libssh/ed25519.h      | 0
 {lib => components}/libssh/include/libssh/fe25519.h      | 0
 {lib => components}/libssh/include/libssh/ge25519.h      | 0
 {lib => components}/libssh/include/libssh/gssapi.h       | 0
 {lib => components}/libssh/include/libssh/kex.h          | 0
 {lib => components}/libssh/include/libssh/keys.h         | 0
 {lib => components}/libssh/include/libssh/knownhosts.h   | 0
 {lib => components}/libssh/include/libssh/legacy.h       | 0
 {lib => components}/libssh/include/libssh/libcrypto.h    | 0
 {lib => components}/libssh/include/libssh/libgcrypt.h    | 0
 .../libssh/include/libssh/libmbedcrypto.h                | 0
 {lib => components}/libssh/include/libssh/libssh.h       | 0
 .../libssh/include/libssh/libssh_version.h               | 0
 {lib => components}/libssh/include/libssh/messages.h     | 0
 {lib => components}/libssh/include/libssh/misc.h         | 0
 {lib => components}/libssh/include/libssh/options.h      | 0
 {lib => components}/libssh/include/libssh/packet.h       | 0
 {lib => components}/libssh/include/libssh/pcap.h         | 0
 {lib => components}/libssh/include/libssh/pki.h          | 0
 {lib => components}/libssh/include/libssh/pki_priv.h     | 0
 {lib => components}/libssh/include/libssh/poll.h         | 0
 {lib => components}/libssh/include/libssh/poly1305.h     | 0
 {lib => components}/libssh/include/libssh/priv.h         | 0
 {lib => components}/libssh/include/libssh/sc25519.h      | 0
 {lib => components}/libssh/include/libssh/scp.h          | 0
 {lib => components}/libssh/include/libssh/server.h       | 0
 {lib => components}/libssh/include/libssh/session.h      | 0
 {lib => components}/libssh/include/libssh/sftp.h         | 0
 {lib => components}/libssh/include/libssh/sftp_priv.h    | 0
 {lib => components}/libssh/include/libssh/socket.h       | 0
 {lib => components}/libssh/include/libssh/ssh2.h         | 0
 {lib => components}/libssh/include/libssh/string.h       | 0
 {lib => components}/libssh/include/libssh/stubs.h        | 0
 {lib => components}/libssh/include/libssh/threads.h      | 0
 {lib => components}/libssh/include/libssh/token.h        | 0
 {lib => components}/libssh/include/libssh/wrapper.h      | 0
 {lib => components}/libssh/src/agent.c                   | 0
 {lib => components}/libssh/src/auth.c                    | 0
 {lib => components}/libssh/src/base64.c                  | 0
 {lib => components}/libssh/src/bignum.c                  | 0
 {lib => components}/libssh/src/bind.c                    | 0
 {lib => components}/libssh/src/bind_config.c             | 0
 {lib => components}/libssh/src/buffer.c                  | 0
 {lib => components}/libssh/src/callbacks.c               | 0
 {lib => components}/libssh/src/chachapoly.c              | 0
 {lib => components}/libssh/src/channels.c                | 0
 {lib => components}/libssh/src/client.c                  | 0
 {lib => components}/libssh/src/config.c                  | 0
 {lib => components}/libssh/src/config_parser.c           | 0
 {lib => components}/libssh/src/connect.c                 | 0
 {lib => components}/libssh/src/connector.c               | 0
 {lib => components}/libssh/src/curve25519.c              | 0
 {lib => components}/libssh/src/dh-gex.c                  | 0
 {lib => components}/libssh/src/dh.c                      | 0
 {lib => components}/libssh/src/dh_key.c                  | 0
 {lib => components}/libssh/src/ecdh.c                    | 0
 {lib => components}/libssh/src/ecdh_mbedcrypto.c         | 0
 {lib => components}/libssh/src/error.c                   | 0
 {lib => components}/libssh/src/external/bcrypt_pbkdf.c   | 0
 {lib => components}/libssh/src/external/blowfish.c       | 0
 {lib => components}/libssh/src/external/chacha.c         | 0
 {lib => components}/libssh/src/external/curve25519_ref.c | 0
 {lib => components}/libssh/src/external/ed25519.c        | 0
 {lib => components}/libssh/src/external/fe25519.c        | 0
 {lib => components}/libssh/src/external/ge25519.c        | 0
 .../libssh/src/external/ge25519_base.data                | 0
 {lib => components}/libssh/src/external/poly1305.c       | 0
 {lib => components}/libssh/src/external/sc25519.c        | 0
 {lib => components}/libssh/src/getpass.c                 | 0
 {lib => components}/libssh/src/init.c                    | 0
 {lib => components}/libssh/src/kdf.c                     | 0
 {lib => components}/libssh/src/kex.c                     | 0
 {lib => components}/libssh/src/known_hosts.c             | 0
 {lib => components}/libssh/src/knownhosts.c              | 0
 {lib => components}/libssh/src/legacy.c                  | 0
 {lib => components}/libssh/src/libmbedcrypto.c           | 0
 {lib => components}/libssh/src/libsshpp.hpp              | 0
 {lib => components}/libssh/src/log.c                     | 0
 {lib => components}/libssh/src/match.c                   | 0
 {lib => components}/libssh/src/mbedcrypto-compat.h       | 0
 {lib => components}/libssh/src/mbedcrypto_missing.c      | 0
 {lib => components}/libssh/src/messages.c                | 0
 {lib => components}/libssh/src/misc.c                    | 0
 {lib => components}/libssh/src/options.c                 | 0
 {lib => components}/libssh/src/packet.c                  | 0
 {lib => components}/libssh/src/packet_cb.c               | 0
 {lib => components}/libssh/src/packet_crypt.c            | 0
 {lib => components}/libssh/src/pcap.c                    | 0
 {lib => components}/libssh/src/pki.c                     | 0
 {lib => components}/libssh/src/pki_container_openssh.c   | 0
 {lib => components}/libssh/src/pki_ed25519.c             | 0
 {lib => components}/libssh/src/pki_ed25519_common.c      | 0
 {lib => components}/libssh/src/pki_mbedcrypto.c          | 0
 {lib => components}/libssh/src/poll.c                    | 0
 {lib => components}/libssh/src/scp.c                     | 0
 {lib => components}/libssh/src/server.c                  | 0
 {lib => components}/libssh/src/session.c                 | 0
 {lib => components}/libssh/src/socket.c                  | 0
 {lib => components}/libssh/src/string.c                  | 0
 {lib => components}/libssh/src/threads.c                 | 0
 {lib => components}/libssh/src/threads/mbedtls.c         | 0
 {lib => components}/libssh/src/threads/noop.c            | 0
 {lib => components}/libssh/src/threads/pthread.c         | 0
 {lib => components}/libssh/src/token.c                   | 0
 {lib => components}/libssh/src/wrapper.c                 | 0
 lib/network-protocol/SSH.h                               | 2 +-
 125 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 components/libssh/CMakeLists.txt
 rename {lib => components}/libssh/include/libssh/agent.h (100%)
 rename {lib => components}/libssh/include/libssh/auth.h (100%)
 rename {lib => components}/libssh/include/libssh/bignum.h (100%)
 rename {lib => components}/libssh/include/libssh/bind.h (100%)
 rename {lib => components}/libssh/include/libssh/bind_config.h (100%)
 rename {lib => components}/libssh/include/libssh/blf.h (100%)
 rename {lib => components}/libssh/include/libssh/buffer.h (100%)
 rename {lib => components}/libssh/include/libssh/bytearray.h (100%)
 rename {lib => components}/libssh/include/libssh/callbacks.h (100%)
 rename {lib => components}/libssh/include/libssh/chacha.h (100%)
 rename {lib => components}/libssh/include/libssh/channels.h (100%)
 rename {lib => components}/libssh/include/libssh/config.h (100%)
 rename {lib => components}/libssh/include/libssh/config_parser.h (100%)
 rename {lib => components}/libssh/include/libssh/crypto.h (100%)
 rename {lib => components}/libssh/include/libssh/curve25519.h (100%)
 rename {lib => components}/libssh/include/libssh/dh-gex.h (100%)
 rename {lib => components}/libssh/include/libssh/dh.h (100%)
 rename {lib => components}/libssh/include/libssh/ecdh.h (100%)
 rename {lib => components}/libssh/include/libssh/ed25519.h (100%)
 rename {lib => components}/libssh/include/libssh/fe25519.h (100%)
 rename {lib => components}/libssh/include/libssh/ge25519.h (100%)
 rename {lib => components}/libssh/include/libssh/gssapi.h (100%)
 rename {lib => components}/libssh/include/libssh/kex.h (100%)
 rename {lib => components}/libssh/include/libssh/keys.h (100%)
 rename {lib => components}/libssh/include/libssh/knownhosts.h (100%)
 rename {lib => components}/libssh/include/libssh/legacy.h (100%)
 rename {lib => components}/libssh/include/libssh/libcrypto.h (100%)
 rename {lib => components}/libssh/include/libssh/libgcrypt.h (100%)
 rename {lib => components}/libssh/include/libssh/libmbedcrypto.h (100%)
 rename {lib => components}/libssh/include/libssh/libssh.h (100%)
 rename {lib => components}/libssh/include/libssh/libssh_version.h (100%)
 rename {lib => components}/libssh/include/libssh/messages.h (100%)
 rename {lib => components}/libssh/include/libssh/misc.h (100%)
 rename {lib => components}/libssh/include/libssh/options.h (100%)
 rename {lib => components}/libssh/include/libssh/packet.h (100%)
 rename {lib => components}/libssh/include/libssh/pcap.h (100%)
 rename {lib => components}/libssh/include/libssh/pki.h (100%)
 rename {lib => components}/libssh/include/libssh/pki_priv.h (100%)
 rename {lib => components}/libssh/include/libssh/poll.h (100%)
 rename {lib => components}/libssh/include/libssh/poly1305.h (100%)
 rename {lib => components}/libssh/include/libssh/priv.h (100%)
 rename {lib => components}/libssh/include/libssh/sc25519.h (100%)
 rename {lib => components}/libssh/include/libssh/scp.h (100%)
 rename {lib => components}/libssh/include/libssh/server.h (100%)
 rename {lib => components}/libssh/include/libssh/session.h (100%)
 rename {lib => components}/libssh/include/libssh/sftp.h (100%)
 rename {lib => components}/libssh/include/libssh/sftp_priv.h (100%)
 rename {lib => components}/libssh/include/libssh/socket.h (100%)
 rename {lib => components}/libssh/include/libssh/ssh2.h (100%)
 rename {lib => components}/libssh/include/libssh/string.h (100%)
 rename {lib => components}/libssh/include/libssh/stubs.h (100%)
 rename {lib => components}/libssh/include/libssh/threads.h (100%)
 rename {lib => components}/libssh/include/libssh/token.h (100%)
 rename {lib => components}/libssh/include/libssh/wrapper.h (100%)
 rename {lib => components}/libssh/src/agent.c (100%)
 rename {lib => components}/libssh/src/auth.c (100%)
 rename {lib => components}/libssh/src/base64.c (100%)
 rename {lib => components}/libssh/src/bignum.c (100%)
 rename {lib => components}/libssh/src/bind.c (100%)
 rename {lib => components}/libssh/src/bind_config.c (100%)
 rename {lib => components}/libssh/src/buffer.c (100%)
 rename {lib => components}/libssh/src/callbacks.c (100%)
 rename {lib => components}/libssh/src/chachapoly.c (100%)
 rename {lib => components}/libssh/src/channels.c (100%)
 rename {lib => components}/libssh/src/client.c (100%)
 rename {lib => components}/libssh/src/config.c (100%)
 rename {lib => components}/libssh/src/config_parser.c (100%)
 rename {lib => components}/libssh/src/connect.c (100%)
 rename {lib => components}/libssh/src/connector.c (100%)
 rename {lib => components}/libssh/src/curve25519.c (100%)
 rename {lib => components}/libssh/src/dh-gex.c (100%)
 rename {lib => components}/libssh/src/dh.c (100%)
 rename {lib => components}/libssh/src/dh_key.c (100%)
 rename {lib => components}/libssh/src/ecdh.c (100%)
 rename {lib => components}/libssh/src/ecdh_mbedcrypto.c (100%)
 rename {lib => components}/libssh/src/error.c (100%)
 rename {lib => components}/libssh/src/external/bcrypt_pbkdf.c (100%)
 rename {lib => components}/libssh/src/external/blowfish.c (100%)
 rename {lib => components}/libssh/src/external/chacha.c (100%)
 rename {lib => components}/libssh/src/external/curve25519_ref.c (100%)
 rename {lib => components}/libssh/src/external/ed25519.c (100%)
 rename {lib => components}/libssh/src/external/fe25519.c (100%)
 rename {lib => components}/libssh/src/external/ge25519.c (100%)
 rename {lib => components}/libssh/src/external/ge25519_base.data (100%)
 rename {lib => components}/libssh/src/external/poly1305.c (100%)
 rename {lib => components}/libssh/src/external/sc25519.c (100%)
 rename {lib => components}/libssh/src/getpass.c (100%)
 rename {lib => components}/libssh/src/init.c (100%)
 rename {lib => components}/libssh/src/kdf.c (100%)
 rename {lib => components}/libssh/src/kex.c (100%)
 rename {lib => components}/libssh/src/known_hosts.c (100%)
 rename {lib => components}/libssh/src/knownhosts.c (100%)
 rename {lib => components}/libssh/src/legacy.c (100%)
 rename {lib => components}/libssh/src/libmbedcrypto.c (100%)
 rename {lib => components}/libssh/src/libsshpp.hpp (100%)
 rename {lib => components}/libssh/src/log.c (100%)
 rename {lib => components}/libssh/src/match.c (100%)
 rename {lib => components}/libssh/src/mbedcrypto-compat.h (100%)
 rename {lib => components}/libssh/src/mbedcrypto_missing.c (100%)
 rename {lib => components}/libssh/src/messages.c (100%)
 rename {lib => components}/libssh/src/misc.c (100%)
 rename {lib => components}/libssh/src/options.c (100%)
 rename {lib => components}/libssh/src/packet.c (100%)
 rename {lib => components}/libssh/src/packet_cb.c (100%)
 rename {lib => components}/libssh/src/packet_crypt.c (100%)
 rename {lib => components}/libssh/src/pcap.c (100%)
 rename {lib => components}/libssh/src/pki.c (100%)
 rename {lib => components}/libssh/src/pki_container_openssh.c (100%)
 rename {lib => components}/libssh/src/pki_ed25519.c (100%)
 rename {lib => components}/libssh/src/pki_ed25519_common.c (100%)
 rename {lib => components}/libssh/src/pki_mbedcrypto.c (100%)
 rename {lib => components}/libssh/src/poll.c (100%)
 rename {lib => components}/libssh/src/scp.c (100%)
 rename {lib => components}/libssh/src/server.c (100%)
 rename {lib => components}/libssh/src/session.c (100%)
 rename {lib => components}/libssh/src/socket.c (100%)
 rename {lib => components}/libssh/src/string.c (100%)
 rename {lib => components}/libssh/src/threads.c (100%)
 rename {lib => components}/libssh/src/threads/mbedtls.c (100%)
 rename {lib => components}/libssh/src/threads/noop.c (100%)
 rename {lib => components}/libssh/src/threads/pthread.c (100%)
 rename {lib => components}/libssh/src/token.c (100%)
 rename {lib => components}/libssh/src/wrapper.c (100%)

diff --git a/components/libssh/CMakeLists.txt b/components/libssh/CMakeLists.txt
new file mode 100644
index 000000000..e2f91e0ca
--- /dev/null
+++ b/components/libssh/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.12)
+
+file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.c)
+
+idf_component_register(
+    INCLUDE_DIRS include src
+    SRCS ${SOURCES}
+    PRIV_REQUIRES esp_netif mbedtls
+)
diff --git a/lib/libssh/include/libssh/agent.h b/components/libssh/include/libssh/agent.h
similarity index 100%
rename from lib/libssh/include/libssh/agent.h
rename to components/libssh/include/libssh/agent.h
diff --git a/lib/libssh/include/libssh/auth.h b/components/libssh/include/libssh/auth.h
similarity index 100%
rename from lib/libssh/include/libssh/auth.h
rename to components/libssh/include/libssh/auth.h
diff --git a/lib/libssh/include/libssh/bignum.h b/components/libssh/include/libssh/bignum.h
similarity index 100%
rename from lib/libssh/include/libssh/bignum.h
rename to components/libssh/include/libssh/bignum.h
diff --git a/lib/libssh/include/libssh/bind.h b/components/libssh/include/libssh/bind.h
similarity index 100%
rename from lib/libssh/include/libssh/bind.h
rename to components/libssh/include/libssh/bind.h
diff --git a/lib/libssh/include/libssh/bind_config.h b/components/libssh/include/libssh/bind_config.h
similarity index 100%
rename from lib/libssh/include/libssh/bind_config.h
rename to components/libssh/include/libssh/bind_config.h
diff --git a/lib/libssh/include/libssh/blf.h b/components/libssh/include/libssh/blf.h
similarity index 100%
rename from lib/libssh/include/libssh/blf.h
rename to components/libssh/include/libssh/blf.h
diff --git a/lib/libssh/include/libssh/buffer.h b/components/libssh/include/libssh/buffer.h
similarity index 100%
rename from lib/libssh/include/libssh/buffer.h
rename to components/libssh/include/libssh/buffer.h
diff --git a/lib/libssh/include/libssh/bytearray.h b/components/libssh/include/libssh/bytearray.h
similarity index 100%
rename from lib/libssh/include/libssh/bytearray.h
rename to components/libssh/include/libssh/bytearray.h
diff --git a/lib/libssh/include/libssh/callbacks.h b/components/libssh/include/libssh/callbacks.h
similarity index 100%
rename from lib/libssh/include/libssh/callbacks.h
rename to components/libssh/include/libssh/callbacks.h
diff --git a/lib/libssh/include/libssh/chacha.h b/components/libssh/include/libssh/chacha.h
similarity index 100%
rename from lib/libssh/include/libssh/chacha.h
rename to components/libssh/include/libssh/chacha.h
diff --git a/lib/libssh/include/libssh/channels.h b/components/libssh/include/libssh/channels.h
similarity index 100%
rename from lib/libssh/include/libssh/channels.h
rename to components/libssh/include/libssh/channels.h
diff --git a/lib/libssh/include/libssh/config.h b/components/libssh/include/libssh/config.h
similarity index 100%
rename from lib/libssh/include/libssh/config.h
rename to components/libssh/include/libssh/config.h
diff --git a/lib/libssh/include/libssh/config_parser.h b/components/libssh/include/libssh/config_parser.h
similarity index 100%
rename from lib/libssh/include/libssh/config_parser.h
rename to components/libssh/include/libssh/config_parser.h
diff --git a/lib/libssh/include/libssh/crypto.h b/components/libssh/include/libssh/crypto.h
similarity index 100%
rename from lib/libssh/include/libssh/crypto.h
rename to components/libssh/include/libssh/crypto.h
diff --git a/lib/libssh/include/libssh/curve25519.h b/components/libssh/include/libssh/curve25519.h
similarity index 100%
rename from lib/libssh/include/libssh/curve25519.h
rename to components/libssh/include/libssh/curve25519.h
diff --git a/lib/libssh/include/libssh/dh-gex.h b/components/libssh/include/libssh/dh-gex.h
similarity index 100%
rename from lib/libssh/include/libssh/dh-gex.h
rename to components/libssh/include/libssh/dh-gex.h
diff --git a/lib/libssh/include/libssh/dh.h b/components/libssh/include/libssh/dh.h
similarity index 100%
rename from lib/libssh/include/libssh/dh.h
rename to components/libssh/include/libssh/dh.h
diff --git a/lib/libssh/include/libssh/ecdh.h b/components/libssh/include/libssh/ecdh.h
similarity index 100%
rename from lib/libssh/include/libssh/ecdh.h
rename to components/libssh/include/libssh/ecdh.h
diff --git a/lib/libssh/include/libssh/ed25519.h b/components/libssh/include/libssh/ed25519.h
similarity index 100%
rename from lib/libssh/include/libssh/ed25519.h
rename to components/libssh/include/libssh/ed25519.h
diff --git a/lib/libssh/include/libssh/fe25519.h b/components/libssh/include/libssh/fe25519.h
similarity index 100%
rename from lib/libssh/include/libssh/fe25519.h
rename to components/libssh/include/libssh/fe25519.h
diff --git a/lib/libssh/include/libssh/ge25519.h b/components/libssh/include/libssh/ge25519.h
similarity index 100%
rename from lib/libssh/include/libssh/ge25519.h
rename to components/libssh/include/libssh/ge25519.h
diff --git a/lib/libssh/include/libssh/gssapi.h b/components/libssh/include/libssh/gssapi.h
similarity index 100%
rename from lib/libssh/include/libssh/gssapi.h
rename to components/libssh/include/libssh/gssapi.h
diff --git a/lib/libssh/include/libssh/kex.h b/components/libssh/include/libssh/kex.h
similarity index 100%
rename from lib/libssh/include/libssh/kex.h
rename to components/libssh/include/libssh/kex.h
diff --git a/lib/libssh/include/libssh/keys.h b/components/libssh/include/libssh/keys.h
similarity index 100%
rename from lib/libssh/include/libssh/keys.h
rename to components/libssh/include/libssh/keys.h
diff --git a/lib/libssh/include/libssh/knownhosts.h b/components/libssh/include/libssh/knownhosts.h
similarity index 100%
rename from lib/libssh/include/libssh/knownhosts.h
rename to components/libssh/include/libssh/knownhosts.h
diff --git a/lib/libssh/include/libssh/legacy.h b/components/libssh/include/libssh/legacy.h
similarity index 100%
rename from lib/libssh/include/libssh/legacy.h
rename to components/libssh/include/libssh/legacy.h
diff --git a/lib/libssh/include/libssh/libcrypto.h b/components/libssh/include/libssh/libcrypto.h
similarity index 100%
rename from lib/libssh/include/libssh/libcrypto.h
rename to components/libssh/include/libssh/libcrypto.h
diff --git a/lib/libssh/include/libssh/libgcrypt.h b/components/libssh/include/libssh/libgcrypt.h
similarity index 100%
rename from lib/libssh/include/libssh/libgcrypt.h
rename to components/libssh/include/libssh/libgcrypt.h
diff --git a/lib/libssh/include/libssh/libmbedcrypto.h b/components/libssh/include/libssh/libmbedcrypto.h
similarity index 100%
rename from lib/libssh/include/libssh/libmbedcrypto.h
rename to components/libssh/include/libssh/libmbedcrypto.h
diff --git a/lib/libssh/include/libssh/libssh.h b/components/libssh/include/libssh/libssh.h
similarity index 100%
rename from lib/libssh/include/libssh/libssh.h
rename to components/libssh/include/libssh/libssh.h
diff --git a/lib/libssh/include/libssh/libssh_version.h b/components/libssh/include/libssh/libssh_version.h
similarity index 100%
rename from lib/libssh/include/libssh/libssh_version.h
rename to components/libssh/include/libssh/libssh_version.h
diff --git a/lib/libssh/include/libssh/messages.h b/components/libssh/include/libssh/messages.h
similarity index 100%
rename from lib/libssh/include/libssh/messages.h
rename to components/libssh/include/libssh/messages.h
diff --git a/lib/libssh/include/libssh/misc.h b/components/libssh/include/libssh/misc.h
similarity index 100%
rename from lib/libssh/include/libssh/misc.h
rename to components/libssh/include/libssh/misc.h
diff --git a/lib/libssh/include/libssh/options.h b/components/libssh/include/libssh/options.h
similarity index 100%
rename from lib/libssh/include/libssh/options.h
rename to components/libssh/include/libssh/options.h
diff --git a/lib/libssh/include/libssh/packet.h b/components/libssh/include/libssh/packet.h
similarity index 100%
rename from lib/libssh/include/libssh/packet.h
rename to components/libssh/include/libssh/packet.h
diff --git a/lib/libssh/include/libssh/pcap.h b/components/libssh/include/libssh/pcap.h
similarity index 100%
rename from lib/libssh/include/libssh/pcap.h
rename to components/libssh/include/libssh/pcap.h
diff --git a/lib/libssh/include/libssh/pki.h b/components/libssh/include/libssh/pki.h
similarity index 100%
rename from lib/libssh/include/libssh/pki.h
rename to components/libssh/include/libssh/pki.h
diff --git a/lib/libssh/include/libssh/pki_priv.h b/components/libssh/include/libssh/pki_priv.h
similarity index 100%
rename from lib/libssh/include/libssh/pki_priv.h
rename to components/libssh/include/libssh/pki_priv.h
diff --git a/lib/libssh/include/libssh/poll.h b/components/libssh/include/libssh/poll.h
similarity index 100%
rename from lib/libssh/include/libssh/poll.h
rename to components/libssh/include/libssh/poll.h
diff --git a/lib/libssh/include/libssh/poly1305.h b/components/libssh/include/libssh/poly1305.h
similarity index 100%
rename from lib/libssh/include/libssh/poly1305.h
rename to components/libssh/include/libssh/poly1305.h
diff --git a/lib/libssh/include/libssh/priv.h b/components/libssh/include/libssh/priv.h
similarity index 100%
rename from lib/libssh/include/libssh/priv.h
rename to components/libssh/include/libssh/priv.h
diff --git a/lib/libssh/include/libssh/sc25519.h b/components/libssh/include/libssh/sc25519.h
similarity index 100%
rename from lib/libssh/include/libssh/sc25519.h
rename to components/libssh/include/libssh/sc25519.h
diff --git a/lib/libssh/include/libssh/scp.h b/components/libssh/include/libssh/scp.h
similarity index 100%
rename from lib/libssh/include/libssh/scp.h
rename to components/libssh/include/libssh/scp.h
diff --git a/lib/libssh/include/libssh/server.h b/components/libssh/include/libssh/server.h
similarity index 100%
rename from lib/libssh/include/libssh/server.h
rename to components/libssh/include/libssh/server.h
diff --git a/lib/libssh/include/libssh/session.h b/components/libssh/include/libssh/session.h
similarity index 100%
rename from lib/libssh/include/libssh/session.h
rename to components/libssh/include/libssh/session.h
diff --git a/lib/libssh/include/libssh/sftp.h b/components/libssh/include/libssh/sftp.h
similarity index 100%
rename from lib/libssh/include/libssh/sftp.h
rename to components/libssh/include/libssh/sftp.h
diff --git a/lib/libssh/include/libssh/sftp_priv.h b/components/libssh/include/libssh/sftp_priv.h
similarity index 100%
rename from lib/libssh/include/libssh/sftp_priv.h
rename to components/libssh/include/libssh/sftp_priv.h
diff --git a/lib/libssh/include/libssh/socket.h b/components/libssh/include/libssh/socket.h
similarity index 100%
rename from lib/libssh/include/libssh/socket.h
rename to components/libssh/include/libssh/socket.h
diff --git a/lib/libssh/include/libssh/ssh2.h b/components/libssh/include/libssh/ssh2.h
similarity index 100%
rename from lib/libssh/include/libssh/ssh2.h
rename to components/libssh/include/libssh/ssh2.h
diff --git a/lib/libssh/include/libssh/string.h b/components/libssh/include/libssh/string.h
similarity index 100%
rename from lib/libssh/include/libssh/string.h
rename to components/libssh/include/libssh/string.h
diff --git a/lib/libssh/include/libssh/stubs.h b/components/libssh/include/libssh/stubs.h
similarity index 100%
rename from lib/libssh/include/libssh/stubs.h
rename to components/libssh/include/libssh/stubs.h
diff --git a/lib/libssh/include/libssh/threads.h b/components/libssh/include/libssh/threads.h
similarity index 100%
rename from lib/libssh/include/libssh/threads.h
rename to components/libssh/include/libssh/threads.h
diff --git a/lib/libssh/include/libssh/token.h b/components/libssh/include/libssh/token.h
similarity index 100%
rename from lib/libssh/include/libssh/token.h
rename to components/libssh/include/libssh/token.h
diff --git a/lib/libssh/include/libssh/wrapper.h b/components/libssh/include/libssh/wrapper.h
similarity index 100%
rename from lib/libssh/include/libssh/wrapper.h
rename to components/libssh/include/libssh/wrapper.h
diff --git a/lib/libssh/src/agent.c b/components/libssh/src/agent.c
similarity index 100%
rename from lib/libssh/src/agent.c
rename to components/libssh/src/agent.c
diff --git a/lib/libssh/src/auth.c b/components/libssh/src/auth.c
similarity index 100%
rename from lib/libssh/src/auth.c
rename to components/libssh/src/auth.c
diff --git a/lib/libssh/src/base64.c b/components/libssh/src/base64.c
similarity index 100%
rename from lib/libssh/src/base64.c
rename to components/libssh/src/base64.c
diff --git a/lib/libssh/src/bignum.c b/components/libssh/src/bignum.c
similarity index 100%
rename from lib/libssh/src/bignum.c
rename to components/libssh/src/bignum.c
diff --git a/lib/libssh/src/bind.c b/components/libssh/src/bind.c
similarity index 100%
rename from lib/libssh/src/bind.c
rename to components/libssh/src/bind.c
diff --git a/lib/libssh/src/bind_config.c b/components/libssh/src/bind_config.c
similarity index 100%
rename from lib/libssh/src/bind_config.c
rename to components/libssh/src/bind_config.c
diff --git a/lib/libssh/src/buffer.c b/components/libssh/src/buffer.c
similarity index 100%
rename from lib/libssh/src/buffer.c
rename to components/libssh/src/buffer.c
diff --git a/lib/libssh/src/callbacks.c b/components/libssh/src/callbacks.c
similarity index 100%
rename from lib/libssh/src/callbacks.c
rename to components/libssh/src/callbacks.c
diff --git a/lib/libssh/src/chachapoly.c b/components/libssh/src/chachapoly.c
similarity index 100%
rename from lib/libssh/src/chachapoly.c
rename to components/libssh/src/chachapoly.c
diff --git a/lib/libssh/src/channels.c b/components/libssh/src/channels.c
similarity index 100%
rename from lib/libssh/src/channels.c
rename to components/libssh/src/channels.c
diff --git a/lib/libssh/src/client.c b/components/libssh/src/client.c
similarity index 100%
rename from lib/libssh/src/client.c
rename to components/libssh/src/client.c
diff --git a/lib/libssh/src/config.c b/components/libssh/src/config.c
similarity index 100%
rename from lib/libssh/src/config.c
rename to components/libssh/src/config.c
diff --git a/lib/libssh/src/config_parser.c b/components/libssh/src/config_parser.c
similarity index 100%
rename from lib/libssh/src/config_parser.c
rename to components/libssh/src/config_parser.c
diff --git a/lib/libssh/src/connect.c b/components/libssh/src/connect.c
similarity index 100%
rename from lib/libssh/src/connect.c
rename to components/libssh/src/connect.c
diff --git a/lib/libssh/src/connector.c b/components/libssh/src/connector.c
similarity index 100%
rename from lib/libssh/src/connector.c
rename to components/libssh/src/connector.c
diff --git a/lib/libssh/src/curve25519.c b/components/libssh/src/curve25519.c
similarity index 100%
rename from lib/libssh/src/curve25519.c
rename to components/libssh/src/curve25519.c
diff --git a/lib/libssh/src/dh-gex.c b/components/libssh/src/dh-gex.c
similarity index 100%
rename from lib/libssh/src/dh-gex.c
rename to components/libssh/src/dh-gex.c
diff --git a/lib/libssh/src/dh.c b/components/libssh/src/dh.c
similarity index 100%
rename from lib/libssh/src/dh.c
rename to components/libssh/src/dh.c
diff --git a/lib/libssh/src/dh_key.c b/components/libssh/src/dh_key.c
similarity index 100%
rename from lib/libssh/src/dh_key.c
rename to components/libssh/src/dh_key.c
diff --git a/lib/libssh/src/ecdh.c b/components/libssh/src/ecdh.c
similarity index 100%
rename from lib/libssh/src/ecdh.c
rename to components/libssh/src/ecdh.c
diff --git a/lib/libssh/src/ecdh_mbedcrypto.c b/components/libssh/src/ecdh_mbedcrypto.c
similarity index 100%
rename from lib/libssh/src/ecdh_mbedcrypto.c
rename to components/libssh/src/ecdh_mbedcrypto.c
diff --git a/lib/libssh/src/error.c b/components/libssh/src/error.c
similarity index 100%
rename from lib/libssh/src/error.c
rename to components/libssh/src/error.c
diff --git a/lib/libssh/src/external/bcrypt_pbkdf.c b/components/libssh/src/external/bcrypt_pbkdf.c
similarity index 100%
rename from lib/libssh/src/external/bcrypt_pbkdf.c
rename to components/libssh/src/external/bcrypt_pbkdf.c
diff --git a/lib/libssh/src/external/blowfish.c b/components/libssh/src/external/blowfish.c
similarity index 100%
rename from lib/libssh/src/external/blowfish.c
rename to components/libssh/src/external/blowfish.c
diff --git a/lib/libssh/src/external/chacha.c b/components/libssh/src/external/chacha.c
similarity index 100%
rename from lib/libssh/src/external/chacha.c
rename to components/libssh/src/external/chacha.c
diff --git a/lib/libssh/src/external/curve25519_ref.c b/components/libssh/src/external/curve25519_ref.c
similarity index 100%
rename from lib/libssh/src/external/curve25519_ref.c
rename to components/libssh/src/external/curve25519_ref.c
diff --git a/lib/libssh/src/external/ed25519.c b/components/libssh/src/external/ed25519.c
similarity index 100%
rename from lib/libssh/src/external/ed25519.c
rename to components/libssh/src/external/ed25519.c
diff --git a/lib/libssh/src/external/fe25519.c b/components/libssh/src/external/fe25519.c
similarity index 100%
rename from lib/libssh/src/external/fe25519.c
rename to components/libssh/src/external/fe25519.c
diff --git a/lib/libssh/src/external/ge25519.c b/components/libssh/src/external/ge25519.c
similarity index 100%
rename from lib/libssh/src/external/ge25519.c
rename to components/libssh/src/external/ge25519.c
diff --git a/lib/libssh/src/external/ge25519_base.data b/components/libssh/src/external/ge25519_base.data
similarity index 100%
rename from lib/libssh/src/external/ge25519_base.data
rename to components/libssh/src/external/ge25519_base.data
diff --git a/lib/libssh/src/external/poly1305.c b/components/libssh/src/external/poly1305.c
similarity index 100%
rename from lib/libssh/src/external/poly1305.c
rename to components/libssh/src/external/poly1305.c
diff --git a/lib/libssh/src/external/sc25519.c b/components/libssh/src/external/sc25519.c
similarity index 100%
rename from lib/libssh/src/external/sc25519.c
rename to components/libssh/src/external/sc25519.c
diff --git a/lib/libssh/src/getpass.c b/components/libssh/src/getpass.c
similarity index 100%
rename from lib/libssh/src/getpass.c
rename to components/libssh/src/getpass.c
diff --git a/lib/libssh/src/init.c b/components/libssh/src/init.c
similarity index 100%
rename from lib/libssh/src/init.c
rename to components/libssh/src/init.c
diff --git a/lib/libssh/src/kdf.c b/components/libssh/src/kdf.c
similarity index 100%
rename from lib/libssh/src/kdf.c
rename to components/libssh/src/kdf.c
diff --git a/lib/libssh/src/kex.c b/components/libssh/src/kex.c
similarity index 100%
rename from lib/libssh/src/kex.c
rename to components/libssh/src/kex.c
diff --git a/lib/libssh/src/known_hosts.c b/components/libssh/src/known_hosts.c
similarity index 100%
rename from lib/libssh/src/known_hosts.c
rename to components/libssh/src/known_hosts.c
diff --git a/lib/libssh/src/knownhosts.c b/components/libssh/src/knownhosts.c
similarity index 100%
rename from lib/libssh/src/knownhosts.c
rename to components/libssh/src/knownhosts.c
diff --git a/lib/libssh/src/legacy.c b/components/libssh/src/legacy.c
similarity index 100%
rename from lib/libssh/src/legacy.c
rename to components/libssh/src/legacy.c
diff --git a/lib/libssh/src/libmbedcrypto.c b/components/libssh/src/libmbedcrypto.c
similarity index 100%
rename from lib/libssh/src/libmbedcrypto.c
rename to components/libssh/src/libmbedcrypto.c
diff --git a/lib/libssh/src/libsshpp.hpp b/components/libssh/src/libsshpp.hpp
similarity index 100%
rename from lib/libssh/src/libsshpp.hpp
rename to components/libssh/src/libsshpp.hpp
diff --git a/lib/libssh/src/log.c b/components/libssh/src/log.c
similarity index 100%
rename from lib/libssh/src/log.c
rename to components/libssh/src/log.c
diff --git a/lib/libssh/src/match.c b/components/libssh/src/match.c
similarity index 100%
rename from lib/libssh/src/match.c
rename to components/libssh/src/match.c
diff --git a/lib/libssh/src/mbedcrypto-compat.h b/components/libssh/src/mbedcrypto-compat.h
similarity index 100%
rename from lib/libssh/src/mbedcrypto-compat.h
rename to components/libssh/src/mbedcrypto-compat.h
diff --git a/lib/libssh/src/mbedcrypto_missing.c b/components/libssh/src/mbedcrypto_missing.c
similarity index 100%
rename from lib/libssh/src/mbedcrypto_missing.c
rename to components/libssh/src/mbedcrypto_missing.c
diff --git a/lib/libssh/src/messages.c b/components/libssh/src/messages.c
similarity index 100%
rename from lib/libssh/src/messages.c
rename to components/libssh/src/messages.c
diff --git a/lib/libssh/src/misc.c b/components/libssh/src/misc.c
similarity index 100%
rename from lib/libssh/src/misc.c
rename to components/libssh/src/misc.c
diff --git a/lib/libssh/src/options.c b/components/libssh/src/options.c
similarity index 100%
rename from lib/libssh/src/options.c
rename to components/libssh/src/options.c
diff --git a/lib/libssh/src/packet.c b/components/libssh/src/packet.c
similarity index 100%
rename from lib/libssh/src/packet.c
rename to components/libssh/src/packet.c
diff --git a/lib/libssh/src/packet_cb.c b/components/libssh/src/packet_cb.c
similarity index 100%
rename from lib/libssh/src/packet_cb.c
rename to components/libssh/src/packet_cb.c
diff --git a/lib/libssh/src/packet_crypt.c b/components/libssh/src/packet_crypt.c
similarity index 100%
rename from lib/libssh/src/packet_crypt.c
rename to components/libssh/src/packet_crypt.c
diff --git a/lib/libssh/src/pcap.c b/components/libssh/src/pcap.c
similarity index 100%
rename from lib/libssh/src/pcap.c
rename to components/libssh/src/pcap.c
diff --git a/lib/libssh/src/pki.c b/components/libssh/src/pki.c
similarity index 100%
rename from lib/libssh/src/pki.c
rename to components/libssh/src/pki.c
diff --git a/lib/libssh/src/pki_container_openssh.c b/components/libssh/src/pki_container_openssh.c
similarity index 100%
rename from lib/libssh/src/pki_container_openssh.c
rename to components/libssh/src/pki_container_openssh.c
diff --git a/lib/libssh/src/pki_ed25519.c b/components/libssh/src/pki_ed25519.c
similarity index 100%
rename from lib/libssh/src/pki_ed25519.c
rename to components/libssh/src/pki_ed25519.c
diff --git a/lib/libssh/src/pki_ed25519_common.c b/components/libssh/src/pki_ed25519_common.c
similarity index 100%
rename from lib/libssh/src/pki_ed25519_common.c
rename to components/libssh/src/pki_ed25519_common.c
diff --git a/lib/libssh/src/pki_mbedcrypto.c b/components/libssh/src/pki_mbedcrypto.c
similarity index 100%
rename from lib/libssh/src/pki_mbedcrypto.c
rename to components/libssh/src/pki_mbedcrypto.c
diff --git a/lib/libssh/src/poll.c b/components/libssh/src/poll.c
similarity index 100%
rename from lib/libssh/src/poll.c
rename to components/libssh/src/poll.c
diff --git a/lib/libssh/src/scp.c b/components/libssh/src/scp.c
similarity index 100%
rename from lib/libssh/src/scp.c
rename to components/libssh/src/scp.c
diff --git a/lib/libssh/src/server.c b/components/libssh/src/server.c
similarity index 100%
rename from lib/libssh/src/server.c
rename to components/libssh/src/server.c
diff --git a/lib/libssh/src/session.c b/components/libssh/src/session.c
similarity index 100%
rename from lib/libssh/src/session.c
rename to components/libssh/src/session.c
diff --git a/lib/libssh/src/socket.c b/components/libssh/src/socket.c
similarity index 100%
rename from lib/libssh/src/socket.c
rename to components/libssh/src/socket.c
diff --git a/lib/libssh/src/string.c b/components/libssh/src/string.c
similarity index 100%
rename from lib/libssh/src/string.c
rename to components/libssh/src/string.c
diff --git a/lib/libssh/src/threads.c b/components/libssh/src/threads.c
similarity index 100%
rename from lib/libssh/src/threads.c
rename to components/libssh/src/threads.c
diff --git a/lib/libssh/src/threads/mbedtls.c b/components/libssh/src/threads/mbedtls.c
similarity index 100%
rename from lib/libssh/src/threads/mbedtls.c
rename to components/libssh/src/threads/mbedtls.c
diff --git a/lib/libssh/src/threads/noop.c b/components/libssh/src/threads/noop.c
similarity index 100%
rename from lib/libssh/src/threads/noop.c
rename to components/libssh/src/threads/noop.c
diff --git a/lib/libssh/src/threads/pthread.c b/components/libssh/src/threads/pthread.c
similarity index 100%
rename from lib/libssh/src/threads/pthread.c
rename to components/libssh/src/threads/pthread.c
diff --git a/lib/libssh/src/token.c b/components/libssh/src/token.c
similarity index 100%
rename from lib/libssh/src/token.c
rename to components/libssh/src/token.c
diff --git a/lib/libssh/src/wrapper.c b/components/libssh/src/wrapper.c
similarity index 100%
rename from lib/libssh/src/wrapper.c
rename to components/libssh/src/wrapper.c
diff --git a/lib/network-protocol/SSH.h b/lib/network-protocol/SSH.h
index d5af4ec1d..308718220 100755
--- a/lib/network-protocol/SSH.h
+++ b/lib/network-protocol/SSH.h
@@ -14,7 +14,7 @@
 #include "Protocol.h"
 
 #include "fnTcpClient.h"
-#include "libssh/libssh.h"
+#include <libssh/libssh.h>
 #ifdef ESP_PLATFORM
 // apc: this is libssh private header!
 #include "libssh/session.h"