From 8c51a52a7f9f66e77afe02cf3b4553cb2df7ebf5 Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Mon, 2 Sep 2019 12:07:26 -0700 Subject: [PATCH] Bump libssh2 to `v1.9.0`, use MbedTLS on all platforms (#33089) * Bump libssh2 to `v1.9.0`, use MbedTLS on all platforms * Remove patches from source builds (cherry picked from commit d3250fe0057063bd57108883659b283be97bb75e) --- deps/Versions.make | 2 +- .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 + .../sha512 | 1 + deps/libssh2.mk | 14 +- deps/libssh2.version | 4 +- deps/patches/libssh2-encryptedpem.patch | 467 ------------------ deps/patches/libssh2-netinet-in.patch | 10 - 61 files changed, 33 insertions(+), 520 deletions(-) delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/md5 delete mode 100644 deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/md5 create mode 100644 deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/sha512 delete mode 100644 deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/md5 delete mode 100644 deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/sha512 create mode 100644 deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/md5 create mode 100644 deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/sha512 delete mode 100644 deps/patches/libssh2-encryptedpem.patch delete mode 100644 deps/patches/libssh2-netinet-in.patch diff --git a/deps/Versions.make b/deps/Versions.make index 46cb02ff00ea1..a5696bcbe6529 100644 --- a/deps/Versions.make +++ b/deps/Versions.make @@ -22,7 +22,7 @@ MPFR_BB_REL = 1 PATCHELF_VER = 0.9 MBEDTLS_VER = 2.16.0 MBEDTLS_BB_REL = v0.17.0 -LIBSSH2_VER = 1.8.2 +LIBSSH2_VER = 1.9.0 LIBSSH2_BB_REL = 0 CURL_VER = 7.61.0 CURL_BB_REL = 1 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/md5 deleted file mode 100644 index 0311e21b7fdbf..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -28854bfd87379dd0ea7a2b421f07749a diff --git a/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/sha512 deleted file mode 100644 index eb3c38414b2ba..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-gnu.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -ee07895157a3814c8d23c752e4970f466166a81044ab64bf60007151d519608a9cecc5e976a8ebc0ab8e113592f436eff03cb00f4e96dfee7e5b4c7648548ef1 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/md5 deleted file mode 100644 index 23ba8adc29fc0..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -cd4b75f06290b7ec628d1b07879e5e06 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/sha512 deleted file mode 100644 index 8c3bd47d7c55c..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.aarch64-linux-musl.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -a4f681f400ac368abead9efb8861d3a910ec1efafc33449ea35b7d83b7fe6d684d1f3c0f9799c51580cd95b602d820652e802ed99ae16652e8ed9e2a98ba31bf diff --git a/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/md5 deleted file mode 100644 index 1f84e77c7c5b4..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -183588e32b4fd315841aab2ebe5e1b83 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/sha512 deleted file mode 100644 index baadb734982b7..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-gnueabihf.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -f7353a55e39a059ddbf82f2b6b942ce0bbdc55630692bf2a5ba7812d07a4829126ba6c58054afa9da0c8c1c50cb4a171ee4ed0315c3686b99ae8bfa6a9306bb0 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/md5 deleted file mode 100644 index 8c94f15ead190..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -9e14dcc998d30bde50927f7a623d9e38 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/sha512 deleted file mode 100644 index aecf3018a5026..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.arm-linux-musleabihf.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -72618212e58a580ea65322414c673b6393469a12c7c0b35c1a9d83c85326ba6807af0a09068e77efbaaacbfe4be4bc84305d186e3778f36bd08204759b2126c4 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/md5 deleted file mode 100644 index 4e2da215cf92b..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -597f28a706b6ad5a9419e94f2a24ac8b diff --git a/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/sha512 deleted file mode 100644 index e92c6783859a2..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-gnu.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -a14f286968fa83ddbc601e56f2ab2acfb4776e9ff347a25f303c5ffea48fd69ba18310df654bc25ad408182461be83d7100298b2c7e6efd0e4e144f0fa876208 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/md5 deleted file mode 100644 index e377ca5e020e3..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -0290b13222afc2f0e3af5a718644c659 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/sha512 deleted file mode 100644 index 232759c54c3bc..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.i686-linux-musl.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -dd8024a682662b290c7c2ce1a792aaaf5e325337ddde6945cc0130341ac65af551c82c11963f81f0569cbbe3b6f54b1723e7d1672b5998eda697b51307d30f0d diff --git a/deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/md5 deleted file mode 100644 index f2406af657d53..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -62fca12d1ef6c99532cb46cd2c9a628f diff --git a/deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/sha512 deleted file mode 100644 index 329c6dec03ee1..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.i686-w64-mingw32.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -16916f0b91d17ad5905653b90d3ddf63264372925a8a362fdef97304fa7836a97f1cfa7bc59e30aa23ea8f3e398d4306df85dda924087310a0c7246367a34c72 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/md5 deleted file mode 100644 index 51ae9f46b2914..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -30e880db24523c7aa86bbf8904ae3c22 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/sha512 deleted file mode 100644 index f986c7ea6a652..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.powerpc64le-linux-gnu.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -ef3c91b5536bbc08df0624c636bce6b0b9705bbb30a63b26521b85bb209edaa8a7ffd49a46764cfee76e2b678a8158c72277f67978592e822fa989237994d1e3 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/md5 deleted file mode 100644 index e5afb1b14b849..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -254eeb7ac30c23d7e3d076f737c3ffec diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/sha512 deleted file mode 100644 index 7940301885273..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-apple-darwin14.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -322ea192d8662b4e9c58f1bab1713b84ec3deb7de77552b393ca5840fba8d0679d1be05032b48060e736558bd79b19fa55a8b5f57bae06b3bc7c53dceb0a8913 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/md5 deleted file mode 100644 index c03ca8e4a7fc9..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -e235922666aa0dde5746638c89ded1ed diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/sha512 deleted file mode 100644 index b117528128a4e..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-gnu.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -4116bcce5278062ec3a51fbbe050e252b254fb8418c1f47530fd408a6ab516eebff26e59cfa72abe6e587e917de5fdbe81f4b11b3e3c6ed969b3a0cbda0acfd9 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/md5 deleted file mode 100644 index aff06f726a59c..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -4deafde7ea0da6de8621ca583e540529 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/sha512 deleted file mode 100644 index 8ef483583bcac..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-linux-musl.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -e1b510bcd0ffca6595150b5e282a66aeb9d2d018e5f1e6593093f57f8131390a65f462dca0f5ee8b72ab0c88a1c30a150e2325d1fd3981d34185de266107c3bd diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/md5 deleted file mode 100644 index ae67f869ba180..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -9f6987a2aba53a7b5481a123d28e38ad diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 deleted file mode 100644 index e2bd104811574..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -7884c23e48a59dad9b411c310102fa9fa55cebcda6c614bfa4a0861b6c847df737b0af153f3560eedeb2f298897888cdb373c07974351d0d67b04d2431dbe8a1 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/md5 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/md5 deleted file mode 100644 index 1ff57efe4f278..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -7d3dcf800dfe3c8681de8997e3d2ef05 diff --git a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/sha512 deleted file mode 100644 index 74ae8e12745f2..0000000000000 --- a/deps/checksums/LibSSH2.v1.8.2-0.x86_64-w64-mingw32.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -7efa869b2c39b29164ca20be593ad72327e937cd659cdab1c8d72b72da027f0ea8de6819cf55ad99a659912c236573fe3d5cddfcb5c00e460239e02b5af01849 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/md5 new file mode 100644 index 0000000000000..f665b70671d94 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/md5 @@ -0,0 +1 @@ +1de9f0816b41dd7c15640d6fd7bb8d5e diff --git a/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/sha512 new file mode 100644 index 0000000000000..ee6dfc6b67292 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-gnu.tar.gz/sha512 @@ -0,0 +1 @@ +c2dbbd47befc923c11efa66f05ec1e1d38a3e3da438dcd5da29748f2e6c6ec944ac1d5e8f0062f4c46513faa39e903c8194df8f680b816458e0337d60ccbd9fa diff --git a/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/md5 new file mode 100644 index 0000000000000..4d8c62c571887 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/md5 @@ -0,0 +1 @@ +6d7a76ebedd2425b53d23ccebd6a4592 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/sha512 new file mode 100644 index 0000000000000..c2fba9ac2e05d --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.aarch64-linux-musl.tar.gz/sha512 @@ -0,0 +1 @@ +b62666ef1f84c8236924188cb31701070356e36f7587d2d3bf13c4049996df06c96e3c4cdf4527fa0091491c5b3103cdfbf07a8fe37601359b86fe87741a2db4 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/md5 new file mode 100644 index 0000000000000..cba02e544cfa0 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/md5 @@ -0,0 +1 @@ +ecc04e3bd5dfde850c58506320810c6e diff --git a/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/sha512 new file mode 100644 index 0000000000000..ae453aac86d4e --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-gnueabihf.tar.gz/sha512 @@ -0,0 +1 @@ +93f7f3f92834d375da5a1fb2e766a7097628422c2d1dcdcc2f5e2388f31d1fbb2736ad8df3bf68c6a0b17e843c76b27c9c0d01b39bb2ea4df57cf6d5b753d322 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/md5 new file mode 100644 index 0000000000000..fd08501b1c5fe --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/md5 @@ -0,0 +1 @@ +d9bc4c981347f8efa5083eaa9be8198a diff --git a/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/sha512 new file mode 100644 index 0000000000000..8052c5f88d57c --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.arm-linux-musleabihf.tar.gz/sha512 @@ -0,0 +1 @@ +8a24b413f144499d866cace7dd32d3f366e6ba43bd170bf7a4924c985781144fa050573afcef9e1f4cedb0f70ec75625752656f6b71c208d95df2f067d9a04fc diff --git a/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/md5 new file mode 100644 index 0000000000000..38c7017d693a4 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/md5 @@ -0,0 +1 @@ +65d5f6fa0a77175cf62ddb6a157715d7 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/sha512 new file mode 100644 index 0000000000000..06bc91b370ea6 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-gnu.tar.gz/sha512 @@ -0,0 +1 @@ +ef93dc51651338e42b23039fbcee8a48e4cfea7e4b9dcd1d0f4049a752e7ec563ed1f0a951157a5402be8b206def82da253f7fa3652c1480a1507bc6faaae382 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/md5 new file mode 100644 index 0000000000000..9ec5c9e2812c9 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/md5 @@ -0,0 +1 @@ +de5c00c9e4b0a9a4d26afe0a73d528b9 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/sha512 new file mode 100644 index 0000000000000..d88f64350432d --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.i686-linux-musl.tar.gz/sha512 @@ -0,0 +1 @@ +7c496df3e147991994bd3c37497e2c51c0ce00e709adb86a8789c8b252af7e8148f7e2e71439e435e78fde4cd7695444a8f532e02529698fc8c795f8ebafff10 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/md5 new file mode 100644 index 0000000000000..88f18fdaf9505 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/md5 @@ -0,0 +1 @@ +6908e848c335c58c8685859916ca840e diff --git a/deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/sha512 new file mode 100644 index 0000000000000..6df03ece59e94 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.i686-w64-mingw32.tar.gz/sha512 @@ -0,0 +1 @@ +f4a004e919b95bba227f0fa2595a60c7caab168f3558ad5559d6f7ab2777dec70eefb434294e8fbafe7414ea15d6669f6a8d09e882183cb8a6efc59298517b1f diff --git a/deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/md5 new file mode 100644 index 0000000000000..5a232e0d478b7 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/md5 @@ -0,0 +1 @@ +72ab7a7bb11e4961036b935c1dd4dfd7 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/sha512 new file mode 100644 index 0000000000000..b873f4919fb8d --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.powerpc64le-linux-gnu.tar.gz/sha512 @@ -0,0 +1 @@ +aaf4e21768ab22a91848116615aea6eb1d9763894a7080bbd88ca50a40382488ad42dde61e220a730ad30a4062f658c233ef0ac298913e7a35f3de62476a31f6 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/md5 new file mode 100644 index 0000000000000..94d5cb6897820 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/md5 @@ -0,0 +1 @@ +f383418e3c79f80a8b808e5a11653acb diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/sha512 new file mode 100644 index 0000000000000..23145f875caff --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-apple-darwin14.tar.gz/sha512 @@ -0,0 +1 @@ +5a49877bd90cb314628e1acd120a6c15319e1b10e7b6326cb3f420f6d1921348c0e2331b50af52388fbc31309cf54bdb31235f1c58571f870756fbe3947cfa22 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/md5 new file mode 100644 index 0000000000000..bc272bbf16652 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/md5 @@ -0,0 +1 @@ +dcab51c5abd84cea28ab5eb8f279fae4 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/sha512 new file mode 100644 index 0000000000000..81331e0a0ad61 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-gnu.tar.gz/sha512 @@ -0,0 +1 @@ +a7888e271801b0992b8b61d1e8d6e4fa3cf69920655bc756d35aafbb685d07df8a2f5af48217b47135edc6bad50748f2c122181bf6c8e7ac77a08ab5c2206ada diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/md5 new file mode 100644 index 0000000000000..6307958e4d280 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/md5 @@ -0,0 +1 @@ +7d64466c8210cd691295ae9ecbb3ae7e diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/sha512 new file mode 100644 index 0000000000000..9f9385a1b1c97 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-linux-musl.tar.gz/sha512 @@ -0,0 +1 @@ +87f0beae3ec9a82cd4df54a480c84b1b04c401fed0cec1515665832aa4a5a2b86923e97beaa37dad8eb259fc1e707b4a47e05747ad88137def12becf1d82a144 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/md5 new file mode 100644 index 0000000000000..dedca8f2d3210 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/md5 @@ -0,0 +1 @@ +82147c4cfe14c5e9213776dc8a3162fe diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 new file mode 100644 index 0000000000000..8391275a28955 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-unknown-freebsd11.1.tar.gz/sha512 @@ -0,0 +1 @@ +ce64acd2655fc2b6af56ec00c910ff0123b32995bb62af9e1d6cf48194ef994fecb3e4f2b16d0e8060c9740206fae178e3b6fe89cf95992289e7dee8fdccb982 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/md5 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/md5 new file mode 100644 index 0000000000000..5560eb2297639 --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/md5 @@ -0,0 +1 @@ +5e751cb7817a151a88b828dc077f0982 diff --git a/deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/sha512 b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/sha512 new file mode 100644 index 0000000000000..72d986e5bf82a --- /dev/null +++ b/deps/checksums/LibSSH2.v1.9.0-0.x86_64-w64-mingw32.tar.gz/sha512 @@ -0,0 +1 @@ +8e8c70a993a30e88e06c11eb7042d7ec45f2737790eda7d14bca8e8689d713eda7ca791b4011bbfe5bbec16039c4bfd5cec068bf0194c104fcaf446d48bf0c1a diff --git a/deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/md5 b/deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/md5 deleted file mode 100644 index 7091746b1815f..0000000000000 --- a/deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -bcf01c3fa49a1684edc2d637ad7e03d6 diff --git a/deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/sha512 b/deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/sha512 deleted file mode 100644 index 2d6d2980fa7f2..0000000000000 --- a/deps/checksums/libssh2-02ecf17a6d5f9837699e8fb3aad0c804caa67eeb.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -ae4c798ae5c13ad1574646896665ccd1f7d91e64573a23662ce7016b00109c1c351013856c25bf12284d9c3996ca3b828506825e50fcb059969adc02a96c06f8 diff --git a/deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/md5 b/deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/md5 new file mode 100644 index 0000000000000..f50f001835835 --- /dev/null +++ b/deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/md5 @@ -0,0 +1 @@ +253c2c3eef1f5c9c54be3e677512ea28 diff --git a/deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/sha512 b/deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/sha512 new file mode 100644 index 0000000000000..ad3f1906406bb --- /dev/null +++ b/deps/checksums/libssh2-42d37aa63129a1b2644bf6495198923534322d64.tar.gz/sha512 @@ -0,0 +1 @@ +1fb3202ab793024dc83a419bc7138c4bce9aa37f1bd6aa199388df9a7d78f3838c1fba38b5a82fe2b912f2cf742f476f0c8f2e30a253d1313317d844ac315606 diff --git a/deps/libssh2.mk b/deps/libssh2.mk index b9bccf1f20884..5d05fb7bf57e5 100644 --- a/deps/libssh2.mk +++ b/deps/libssh2.mk @@ -29,17 +29,7 @@ ifeq ($(LIBSSH2_ENABLE_TESTS), 0) LIBSSH2_OPTS += -DBUILD_TESTING=OFF endif -$(SRCCACHE)/$(LIBSSH2_SRC_DIR)/libssh2-encryptedpem.patch-applied: $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/source-extracted - cd $(SRCCACHE)/$(LIBSSH2_SRC_DIR) && patch -p1 -f < $(SRCDIR)/patches/libssh2-encryptedpem.patch - echo 1 > $@ - -# Patch submitted upstream: https://github.com/libssh2/libssh2/pull/148 -# Remove the patch here once we're using a version of libssh2 that includes the upstream patch -$(SRCCACHE)/$(LIBSSH2_SRC_DIR)/libssh2-netinet-in.patch-applied: $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/libssh2-encryptedpem.patch-applied - cd $(SRCCACHE)/$(LIBSSH2_SRC_DIR) && patch -p0 -f < $(SRCDIR)/patches/libssh2-netinet-in.patch - echo 1 > $@ - -$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/source-extracted $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/libssh2-netinet-in.patch-applied +$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: $(SRCCACHE)/$(LIBSSH2_SRC_DIR)/source-extracted mkdir -p $(dir $@) cd $(dir $@) && \ $(CMAKE) $(dir $<) $(LIBSSH2_OPTS) @@ -74,7 +64,7 @@ check-libssh2: $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-checked else # USE_BINARYBUILDER_LIBSSH2 -LIBSSH2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibSSH2-v$(LIBSSH2_VER)-$(LIBSSH2_BB_REL) +LIBSSH2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibSSH2-v$(LIBSSH2_VER)+$(LIBSSH2_BB_REL) LIBSSH2_BB_NAME := LibSSH2.v$(LIBSSH2_VER) $(eval $(call bb-install,libssh2,LIBSSH2,false)) diff --git a/deps/libssh2.version b/deps/libssh2.version index fe1ecb3080028..09023514a2a51 100644 --- a/deps/libssh2.version +++ b/deps/libssh2.version @@ -1,2 +1,2 @@ -LIBSSH2_BRANCH=libssh2-1.8.2 -LIBSSH2_SHA1=02ecf17a6d5f9837699e8fb3aad0c804caa67eeb +LIBSSH2_BRANCH=libssh2-1.9.0 +LIBSSH2_SHA1=42d37aa63129a1b2644bf6495198923534322d64 diff --git a/deps/patches/libssh2-encryptedpem.patch b/deps/patches/libssh2-encryptedpem.patch deleted file mode 100644 index c621cc5ad0684..0000000000000 --- a/deps/patches/libssh2-encryptedpem.patch +++ /dev/null @@ -1,467 +0,0 @@ -commit 8304968ceb516ea21740f7c5383fa4a3a8d84e46 -Author: Keno Fischer -Date: Wed Jul 20 18:49:21 2016 -0400 - - Add supported for passphrase-protected PEM files to WinCNG and GCrypt backends - - Since they use our own PEM parser which did not support encrypted PEM files, - trying to use such files on these backends failed. Fix that by augmenting - the PEM parser to support encrypted PEM files. - -diff --git a/src/crypt.c b/src/crypt.c -index 931ae8b..853682d 100644 ---- a/src/crypt.c -+++ b/src/crypt.c -@@ -53,6 +53,7 @@ crypt_none_crypt(LIBSSH2_SESSION * session, unsigned char *buf, - - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_none = { - "none", -+ "DEK-Info: NONE" - 8, /* blocksize (SSH2 defines minimum blocksize as 8) */ - 0, /* iv_len */ - 0, /* secret_len */ -@@ -119,6 +120,7 @@ crypt_dtor(LIBSSH2_SESSION * session, void **abstract) - #if LIBSSH2_AES_CTR - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes128_ctr = { - "aes128-ctr", -+ "", - 16, /* blocksize */ - 16, /* initial value length */ - 16, /* secret length -- 16*8 == 128bit */ -@@ -131,6 +133,7 @@ static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes128_ctr = { - - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes192_ctr = { - "aes192-ctr", -+ "", - 16, /* blocksize */ - 16, /* initial value length */ - 24, /* secret length -- 24*8 == 192bit */ -@@ -143,6 +146,7 @@ static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes192_ctr = { - - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes256_ctr = { - "aes256-ctr", -+ "", - 16, /* blocksize */ - 16, /* initial value length */ - 32, /* secret length -- 32*8 == 256bit */ -@@ -157,6 +161,7 @@ static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes256_ctr = { - #if LIBSSH2_AES - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes128_cbc = { - "aes128-cbc", -+ "DEK-Info: AES-128-CBC", - 16, /* blocksize */ - 16, /* initial value length */ - 16, /* secret length -- 16*8 == 128bit */ -@@ -169,6 +174,7 @@ static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes128_cbc = { - - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes192_cbc = { - "aes192-cbc", -+ "DEK-Info: AES-192-CBC", - 16, /* blocksize */ - 16, /* initial value length */ - 24, /* secret length -- 24*8 == 192bit */ -@@ -181,6 +187,7 @@ static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes192_cbc = { - - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes256_cbc = { - "aes256-cbc", -+ "DEK-Info: AES-256-CBC", - 16, /* blocksize */ - 16, /* initial value length */ - 32, /* secret length -- 32*8 == 256bit */ -@@ -195,6 +202,7 @@ static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_aes256_cbc = { - static const LIBSSH2_CRYPT_METHOD - libssh2_crypt_method_rijndael_cbc_lysator_liu_se = { - "rijndael-cbc@lysator.liu.se", -+ "DEK-Info: AES-256-CBC", - 16, /* blocksize */ - 16, /* initial value length */ - 32, /* secret length -- 32*8 == 256bit */ -@@ -209,6 +217,7 @@ static const LIBSSH2_CRYPT_METHOD - #if LIBSSH2_BLOWFISH - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_blowfish_cbc = { - "blowfish-cbc", -+ "", - 8, /* blocksize */ - 8, /* initial value length */ - 16, /* secret length */ -@@ -223,6 +232,7 @@ static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_blowfish_cbc = { - #if LIBSSH2_RC4 - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_arcfour = { - "arcfour", -+ "DEK-Info: RC4", - 8, /* blocksize */ - 8, /* initial value length */ - 16, /* secret length */ -@@ -258,6 +268,7 @@ crypt_init_arcfour128(LIBSSH2_SESSION * session, - - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_arcfour128 = { - "arcfour128", -+ "", - 8, /* blocksize */ - 8, /* initial value length */ - 16, /* secret length */ -@@ -272,6 +283,7 @@ static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_arcfour128 = { - #if LIBSSH2_CAST - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_cast128_cbc = { - "cast128-cbc", -+ "", - 8, /* blocksize */ - 8, /* initial value length */ - 16, /* secret length */ -@@ -286,6 +298,7 @@ static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_cast128_cbc = { - #if LIBSSH2_3DES - static const LIBSSH2_CRYPT_METHOD libssh2_crypt_method_3des_cbc = { - "3des-cbc", -+ "DEK-Info: DES-EDE3-CBC", - 8, /* blocksize */ - 8, /* initial value length */ - 24, /* secret length */ -diff --git a/src/libgcrypt.c b/src/libgcrypt.c -index 366d007..901be05 100644 ---- a/src/libgcrypt.c -+++ b/src/libgcrypt.c -@@ -172,8 +172,6 @@ _libssh2_rsa_new_private(libssh2_rsa_ctx ** rsa, - unsigned char *n, *e, *d, *p, *q, *e1, *e2, *coeff; - unsigned int nlen, elen, dlen, plen, qlen, e1len, e2len, coefflen; - -- (void) passphrase; -- - fp = fopen(filename, "r"); - if (!fp) { - return -1; -@@ -182,6 +180,7 @@ _libssh2_rsa_new_private(libssh2_rsa_ctx ** rsa, - ret = _libssh2_pem_parse(session, - "-----BEGIN RSA PRIVATE KEY-----", - "-----END RSA PRIVATE KEY-----", -+ passphrase, - fp, &data, &datalen); - fclose(fp); - if (ret) { -@@ -285,8 +284,6 @@ _libssh2_dsa_new_private(libssh2_dsa_ctx ** dsa, - unsigned char *p, *q, *g, *y, *x; - unsigned int plen, qlen, glen, ylen, xlen; - -- (void) passphrase; -- - fp = fopen(filename, "r"); - if (!fp) { - return -1; -@@ -295,6 +292,7 @@ _libssh2_dsa_new_private(libssh2_dsa_ctx ** dsa, - ret = _libssh2_pem_parse(session, - "-----BEGIN DSA PRIVATE KEY-----", - "-----END DSA PRIVATE KEY-----", -+ passphrase, - fp, &data, &datalen); - fclose(fp); - if (ret) { -diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h -index b4296a2..77b51a9 100644 ---- a/src/libssh2_priv.h -+++ b/src/libssh2_priv.h -@@ -884,6 +884,7 @@ struct _LIBSSH2_HOSTKEY_METHOD - struct _LIBSSH2_CRYPT_METHOD - { - const char *name; -+ const char *pem_annotation; - - int blocksize; - -@@ -1041,6 +1042,7 @@ const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); - int _libssh2_pem_parse(LIBSSH2_SESSION * session, - const char *headerbegin, - const char *headerend, -+ const unsigned char *passphrase, - FILE * fp, unsigned char **data, unsigned int *datalen); - int _libssh2_pem_parse_memory(LIBSSH2_SESSION * session, - const char *headerbegin, -diff --git a/src/os400qc3.c b/src/os400qc3.c -index f8e46ab..a42b374 100644 ---- a/src/os400qc3.c -+++ b/src/os400qc3.c -@@ -2120,6 +2120,7 @@ try_pem_load(LIBSSH2_SESSION *session, FILE *fp, - fseek(fp, 0L, SEEK_SET); - for (;;) { - ret = _libssh2_pem_parse(session, header, trailer, -+ NULL, - fp, &data, &datalen); - - if (!ret) { -diff --git a/src/pem.c b/src/pem.c -index 9f51bba..523d9c5 100644 ---- a/src/pem.c -+++ b/src/pem.c -@@ -37,6 +37,7 @@ - */ - - #include "libssh2_priv.h" -+#include - - static int - readline(char *line, int line_size, FILE * fp) -@@ -96,16 +97,26 @@ readline_memory(char *line, size_t line_size, - - #define LINE_SIZE 128 - -+const char *crypt_annotation = "Proc-Type: 4,ENCRYPTED"; -+ -+static unsigned char hex_decode(char digit) -+{ -+ return (digit >= 'A') ? 0xA + (digit - 'A') : (digit - '0'); -+} -+ - int - _libssh2_pem_parse(LIBSSH2_SESSION * session, - const char *headerbegin, - const char *headerend, -+ const unsigned char *passphrase, - FILE * fp, unsigned char **data, unsigned int *datalen) - { - char line[LINE_SIZE]; -+ unsigned char iv[LINE_SIZE]; - char *b64data = NULL; - unsigned int b64datalen = 0; - int ret; -+ const LIBSSH2_CRYPT_METHOD *method = NULL; - - do { - *line = '\0'; -@@ -116,7 +127,45 @@ _libssh2_pem_parse(LIBSSH2_SESSION * session, - } - while (strcmp(line, headerbegin) != 0); - -- *line = '\0'; -+ if (readline(line, LINE_SIZE, fp)) { -+ return -1; -+ } -+ -+ if (passphrase && -+ memcmp(line, crypt_annotation, strlen(crypt_annotation)) == 0) { -+ const LIBSSH2_CRYPT_METHOD **all_methods, *cur_method; -+ int i; -+ -+ if (readline(line, LINE_SIZE, fp)) { -+ ret = -1; -+ goto out; -+ } -+ all_methods = libssh2_crypt_methods(); -+ while ((cur_method = *all_methods++)) { -+ if (*cur_method->pem_annotation && -+ memcmp(line, cur_method->pem_annotation, strlen(cur_method->pem_annotation)) == 0) { -+ method = cur_method; -+ memcpy(iv, line+strlen(method->pem_annotation)+1, 2*method->iv_len); -+ } -+ } -+ -+ /* None of the available crypt methods were able to decrypt this key */ -+ if (method == NULL) -+ return -1; -+ -+ /* Decode IV from hex */ -+ for (i = 0; i < method->iv_len; ++i) -+ { -+ iv[i] = hex_decode(iv[2*i]) << 4; -+ iv[i] |= hex_decode(iv[2*i+1]); -+ } -+ -+ /* skip to the next line */ -+ if (readline(line, LINE_SIZE, fp)) { -+ ret = -1; -+ goto out; -+ } -+ } - - do { - if (*line) { -@@ -152,6 +201,72 @@ _libssh2_pem_parse(LIBSSH2_SESSION * session, - goto out; - } - -+ if (method) { -+ /* Set up decryption */ -+ int free_iv = 0, free_secret = 0, len_decrypted = 0, padding = 0; -+ int blocksize = method->blocksize; -+ void *abstract; -+ unsigned char secret[2*MD5_DIGEST_LENGTH]; -+ libssh2_md5_ctx fingerprint_ctx; -+ -+ /* Perform key derivation (PBKDF1/MD5) */ -+ if (!libssh2_md5_init(&fingerprint_ctx)) { -+ ret = -1; -+ goto out; -+ } -+ libssh2_md5_update(fingerprint_ctx, passphrase, strlen((char*)passphrase)); -+ libssh2_md5_update(fingerprint_ctx, iv, 8); -+ libssh2_md5_final(fingerprint_ctx, secret); -+ if (method->secret_len > MD5_DIGEST_LENGTH) { -+ if (!libssh2_md5_init(&fingerprint_ctx)) { -+ ret = -1; -+ goto out; -+ } -+ libssh2_md5_update(fingerprint_ctx, secret, MD5_DIGEST_LENGTH); -+ libssh2_md5_update(fingerprint_ctx, passphrase, strlen((char*)passphrase)); -+ libssh2_md5_update(fingerprint_ctx, iv, 8); -+ libssh2_md5_final(fingerprint_ctx, secret + MD5_DIGEST_LENGTH); -+ } -+ -+ /* Initialize the decryption */ -+ if (method->init(session, method, iv, &free_iv, secret, -+ &free_secret, 0, &abstract)) { -+ memset((char*)secret, 0, sizeof(secret)); -+ LIBSSH2_FREE(session, data); -+ ret = -1; -+ goto out; -+ } -+ -+ if (free_secret) { -+ memset((char*)secret, 0, sizeof(secret)); -+ } -+ -+ /* Do the actual decryption */ -+ assert((*datalen % blocksize) == 0); -+ -+ while (len_decrypted <= *datalen - blocksize) { -+ if (method->crypt(session, *data + len_decrypted, blocksize, -+ &abstract)) { -+ ret = LIBSSH2_ERROR_DECRYPT; -+ method->dtor(session, &abstract); -+ memset(*data, 0, *datalen); -+ LIBSSH2_FREE(session, *data); -+ goto out; -+ } -+ -+ len_decrypted += blocksize; -+ } -+ -+ /* Account for padding */ -+ padding = (*data)[*datalen - 1]; -+ memset(&(*data)[*datalen-padding],0,padding); -+ *datalen -= padding; -+ -+ /* Clean up */ -+ memset((char*)secret, 0, sizeof(secret)); -+ method->dtor(session, &abstract); -+ } -+ - ret = 0; - out: - if (b64data) { -diff --git a/src/wincng.c b/src/wincng.c -index d3271b3..e6278c3 100755 ---- a/src/wincng.c -+++ b/src/wincng.c -@@ -537,14 +537,13 @@ _libssh2_wincng_load_pem(LIBSSH2_SESSION *session, - FILE *fp; - int ret; - -- (void)passphrase; -- - fp = fopen(filename, "r"); - if (!fp) { - return -1; - } - - ret = _libssh2_pem_parse(session, headerbegin, headerend, -+ passphrase, - fp, data, datalen); - - fclose(fp); -diff --git a/tests/etc/user b/tests/etc/user -index 01bf6ac..5f1783d 100644 ---- a/tests/etc/user -+++ b/tests/etc/user -@@ -1,27 +1,30 @@ - -----BEGIN RSA PRIVATE KEY----- --MIIEoQIBAAKCAQEAxIgBuZS39D4bFnWminE7svGQLdVKx1aWKnEYEa+XtNU4DKZ/ --pxUHg0zbEBya+IkX1yqQYWALoiOwI8XhdemLp8g03BX7o+DLSWisfiHpCDVGAuNq --RDF7qnFyL/ZBH6e0XKMtsoB51TDuBc4Rxh6p1V2QL/fg8BoHcCrnKkoqN8PSoKUX --2lPKJ3JIF/P8cDLbKYCvbSTFOdf56eqg0GJe7jFtSwweE9yz3IWZ3kSS1E/9E6sX --aNCu/hUt1bvQthICQyBNoTtQP/igEUJ7n0GMetsnq9wiUSomLzWqIWNqmvOv62aC --XRi5sYgpSAR4Zvnm3Cx/Wl0BEPz2rrFkG+G0SQIBIwKCAQEAgSYtBOyzZfztOqUV --q277WFWZQrC8HJf8R8aparU3zpq+braOZnuImByP9KUVYX6pRECKw6WD/NWfonq4 --uzMSoXTviVBGRx6xeWIK880kG1Y1UlruD447Ur+ULiV7QLAIzylnLCiKk2lL9S+l --R63AD95mEOS4Y0ROB+Gt2fY5ABHRMqhGLvRKK8qwn35C1Z9qnTGhgiRbeoc373A5 --ZAYyegyLnbvyV47UfPYS/TVzxZ9RCx3D3I/9fI7ZAFafkkIufQX3QPaVxf0zFUwW --de/f+gTbySTL4RDF185Evunx+tYvzCyIimB0cTE5dfsCWcHDtO6DwehKiOgJsbeW --IrpeTwKBgQDnEMfv7ORR35Ouj91iNCSfLU/v0TSzAJBfqYovByhXRsopgWAKXUmH --mWpBBP5vcGu3NvKfiZcMMbBPfllvlxkafQwvCqrdn5mg01MdAHMWP/O9yfvuxMDE --KycU2G2CT8j85mIPn19WeIgXC/kws+P0RAVNCBNeq89Gvp4IdLN67wKBgQDZvTYh --TPCYG32jBK+CcWmOna2SLvBloDcNevhzfu3RGjLIXzUHGxLdx7slsP/tpndmXIAL --CgV6GfrLxix5bO08203S2qnnwP8VrjjNIv1CyZIbbQFAFIeC3QxZMZHnXieLrO0z --qF5CuUXcL3cMeGmF/0HN/rB+4sF0qfv8wD8kRwKBgFXTCG8O2HYueK6NNPiXBknA --X4T17wCocCOIHWHstzZcHzP82oeBvDmuAuTzOe7gnQmJcA9e/ZbQoJKOA/Y/b7lh --pXCO7wHcMb9kb1PqOWAJIASqG78V4TLrdOp8Re6Sqb0FHRu+2kSwbQ/f4DapN2lb --F+lpZke8KGq71ExImm99AoGAN/10UbSy5UjlytVRs9QFM00eAQTBeTfTpGFzFmJ3 --qsw48bIU8zLY9zNcAmC21rXG7m+Oo8C/lG0UmsyPF+jPSinDjf22qU7iger4qccr --Lm5YxTlJduC1IaaOJZBnWMBwkaF+0sTlCdfew5ctPbiQKcVLb3wBf7amxjpWvVYB --m50CgYAT6t2/Suav21J5zpzyrrt+oMZQ3MMzBnPHFRUQ1FdqZnE4eW5a10g0P+E+ --YeTol+fYxL34+cI5PREK3dcnW1E8g8KOsOQqMgWdTfZEDHYRLqEyGIhu20aqfJCY --qu9tBburQoSlym9aQp41CMxIyHrL4GnwRlJkTTEVhDuab1HmKw== -+Proc-Type: 4,ENCRYPTED -+DEK-Info: AES-128-CBC,452208EE925946C14BF29ABD1425A8DF -+ -+qTRxBL3/Ldh3NjoYUpZ+IsiQDqLrVG/rS20w1yQJMFXf+VPu+MjlWhGhrB6yscAH -+IyEje8X/YSB7tS3UNQuCLZVsPbDf5ZAUKz9EMERh3NmzxHFfOi9+7+enYJjaqyr9 -+cwYJ7OIk2stwMHlp71LMfSmmJOD+TA68j6PcOa0dsfJKZ6O/Pcc0o7qkWXUamybE -+YfvUoT9EigSqVukdEL2HqC4tlpUL5cJo8uteyYfnHP0b1weUy8i7utE5jPOt4sK2 -+3gUk4mZHHy78NgV8HLwKlDD12CmbotjzXXs9+Aqu6TUjqrzJkHy7z6JkXqMQLyfC -+wBehnpu4bCRTuEbV8wI/6cb6POjnSHBw9m+E7Uo8bPlQrFbtYrVh2gC1C4NuOZxr -+EgJS8JXFoodSH8tthZJa4Xs/IO7AGcz9W/hn6TZ5kBLrhfXBzy08PaMP6lr/icSS -+2YpImXnYAbqTGuaAPZwsKzNGew5iVds5QoOAzXEO+l5rSEp9L2OKjM/tli96a9T3 -+T3vOWnVv6IC6nAV2wFrreHUPJTINzJZ2cSD17uudX53QWBOXj7ym+CwODdE5OgsW -+5lysVuXHpMhV3CcTG7BihmmenP7dsyQ/nF/8MYAqY2PcQnQ2PQ8uXpPXTwkmDPnV -++jBpZc54EWk6OP99aUoqDk2tMMyi7FBZgtzY+yWqsvb8oB0RStmbqxxdy27EkHvD -+KNvrXVwkHxFSMduPwKr34x6Ecz7wwrcM/XlFD13/aZ46xhfXa3N1fQSLETf4l67e -+2/tuWHE7qMslJ86jKk0Pj2arT/tfuVufXvjokZjkOVez2GU9WnyP3CGBOVZfrrE9 -+Cub7ULRuG8gIKLCeaNcuuYen5R09oDpvgA1b9BnaF+x9mrrn3mPvpIl/+j6YeBpy -+PGV4mJuGkjphBWiwDelUG/HDqpnwXJ2fuIrIXqdwSsTV0HIholRWpxonpAepMCiZ -+arxAm1rIC8ku2ZyRG8lwd1o8VAmDbntbCE7JDcUpXI8/LeTFTVQ1Ewdy0LPE2/9o -+BBoCqzBygop+AJkm2Nb9i54dRbUqkl10wTf0M9THWzUZ4orFtSGObqEQHQekyoDP -+6/onV4M77Ptvz1oX/2x2CLUTDDS5RKHcqE8Z6br93W14Gq7pQgu0clPsFwaDeTPk -+NdEhX14R1MKUednIGSBTXt2DRych+OJFdHSG48kg90o0hHbD6dAkunTJJVmkIH6i -+qwaOLArr5+vQS2OEvr0I5UESdAqL5mXpz/ciheM//nUaQRqAa6eURTjJYEZjXCKv -+0UjqOo0ola7KzchUoH33k14BapcgcYWrBGkP27MEv4eVrNtRZtPUAFNN68esF0l5 -+d/sGtJAjcrpVjHnnd21XIuywP5VZsOzZZn1ea3obfVYzbuoVJ/L4zpmn+eFR2IIp -+SExrFWV+SCvzGvSDHDbg7y081qgaQgn/Xte3DwlCbBWCGSVS3TVSJSnYAXU5mq9z -+D6Zn1fE2foefWrlXYeDfZLY1M463Tufag55uI16RrSzb/nfSBFTqi4TJAzVkn+gi -+jy3LwEdOKAk/d/etr8wL/WWZ+w334TG7pMoAKErVJ/NexG4vzzHedExvTaEMD/eS - -----END RSA PRIVATE KEY----- -diff --git a/tests/etc/user-decrypted b/tests/etc/user-decrypted -new file mode 100644 -index 0000000..f99cf65 ---- /dev/null -+++ b/tests/etc/user-decrypted -@@ -0,0 +1,27 @@ -+*data[*datalen - 1]-----BEGIN RSA PRIVATE KEY----- -+MIIEogIBAAKCAQEAl46YP4uEaIStJEUuGEa6/dmtykdWrZCTqM9iOnfVNawlM8tE -+6yHppI8c6FppPRErhlFfzEUqqeB4o19vAyTNYB3WyfNUbtSVvWbNz5+j4jvllC/8 -+7TD5rGp9JzAjFtmzJcT5GplvHiBV9aqAnfvplA9C4cHmdTChSPg8C4tPXoMNhTl0 -+GmNVEhTdiBzQdAsPPJGn2pQzFcF2fnyHcPUD9Shx4P48dacmL4/T9mwSZ0IrBkuQ -+qcu0mE4RSd6mSuXRl4SiFv4vNmIGlt0NIBgytZbdi/bbkJ79iNiyCaFxjWDh+fOP -+AqJAQCSjTnjvXpe3mxDe2M58F6qETHGu3ssVOQIDAQABAoIBADTFrjXSOtS5/h/3 -+BsnlNw9VULJyjLf686+AJs/9EfySaJHUYbcOI/Ds9D/j22ksJV+rzhOuseBdDSS2 -+Ak2x7uFdAoFnfSrqUwmUVm3JRKNt/87NtuBQgV+L5PBUTqOSQlMQdzzP2GVBFS1p -+pUddhEPN3JgHkFuWB1MFPMM4Sva5WjruIA5QFQb1a/yU+RPlSqzlK7POp/jHrJwy -+zjhqvVn4eZ4/qQBAd1zGtHf4LaEaN0VBHcJv2M/+olR4p1fmOBxisIeoauTmGQCU -+nEYMAFydKW581S3qm2TLUudp3eeHvgFlfAbb0Mn88OlTu4+A7nTCsPe5og6ni4Wy -+c9TaKAECgYEAxbL33HMq5U8EcRM8fKFKzOPaN+jy0bgmXC8HzXwKh4XRp3AL1U08 -+MKxwBhtyPqZiasWRw2RFzyMZ+0xsdK41xLysY64STuaqbaFLFSSclJdt1OiTGFWG -+cULADzmTZIe7pWyJjtyvpUvzXtVSgB0arOkJFiOSA94qcqUAY/MajnkCgYEAxEAw -+3b1i2VBXbKiPIjqa8OCu55vli3Z4LRGVL++zLsv7Kjbd8wcbC3DtcVegJzPikuRq -++J+zF34vKy4ZhujGTpv9v02sQz3NP/I7Q74u8ptLNDa6GhLv4N2w+6Fg3xn0VIvw -+YQZnXlrumUHzABG89rU/lidomsYGNu3163vYDMECgYBHWglU+gfgTP14Zg3tmTTq -+781hYmTIxiKqIJs7UWpncSeyu6C5si9oDcQ8oAlCjUB18qpiD72WPb/xz6pRDlL/ -+l2zMaRXYfi3CdXUow1bz1hdgwTPdk3h7RjEVDZ2hqc9Sq/KVqhaGnPvQHUOyU06+ -+WzjZUaswVC2TxPN4H1RVWQKBgDpPGDXJ32TSCieurVhuMTsAhvcpyrn1KR+66aik -+f4iX8rhINQnQQqjTlLjoYB1FvTwHwgC88mk4hKs/tzXuU31nu6zrVxNjeWhWgGVQ -+TIKowV9yIzk8Bym4tK0O9clT3NSB/5nUXUIbomjGv3x1yL9EevASJXJXA+GuMjMV -+SMwBAoGADB7N+svIEmbxIOUURDJEIIDpmU4P1760ikLdzXHJFtkzeLaVmORex9OD -+dihk39bZctvgBvtSFFXxdImr7rzakFVwT0oQkKGfTgYpei9nK3VSOBeivAjuway6 -+aK73cbiiU7Mcuppn7ml8TqxVrGy//g4cJCoscPU9PG9KdoDNYvM= -+-----END RSA PRIVATE KEY----- -diff --git a/tests/etc/user.pub b/tests/etc/user.pub -index c60e90d..2fc7b4b 100644 ---- a/tests/etc/user.pub -+++ b/tests/etc/user.pub -@@ -1 +1 @@ --ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxIgBuZS39D4bFnWminE7svGQLdVKx1aWKnEYEa+XtNU4DKZ/pxUHg0zbEBya+IkX1yqQYWALoiOwI8XhdemLp8g03BX7o+DLSWisfiHpCDVGAuNqRDF7qnFyL/ZBH6e0XKMtsoB51TDuBc4Rxh6p1V2QL/fg8BoHcCrnKkoqN8PSoKUX2lPKJ3JIF/P8cDLbKYCvbSTFOdf56eqg0GJe7jFtSwweE9yz3IWZ3kSS1E/9E6sXaNCu/hUt1bvQthICQyBNoTtQP/igEUJ7n0GMetsnq9wiUSomLzWqIWNqmvOv62aCXRi5sYgpSAR4Zvnm3Cx/Wl0BEPz2rrFkG+G0SQ== jas@mocca -+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXjpg/i4RohK0kRS4YRrr92a3KR1atkJOoz2I6d9U1rCUzy0TrIemkjxzoWmk9ESuGUV/MRSqp4HijX28DJM1gHdbJ81Ru1JW9Zs3Pn6PiO+WUL/ztMPmsan0nMCMW2bMlxPkamW8eIFX1qoCd++mUD0LhweZ1MKFI+DwLi09egw2FOXQaY1USFN2IHNB0Cw88kafalDMVwXZ+fIdw9QP1KHHg/jx1pyYvj9P2bBJnQisGS5Cpy7SYThFJ3qZK5dGXhKIW/i82YgaW3Q0gGDK1lt2L9tuQnv2I2LIJoXGNYOH5848CokBAJKNOeO9el7ebEN7YznwXqoRMca7eyxU5 libssh2test@example.com diff --git a/deps/patches/libssh2-netinet-in.patch b/deps/patches/libssh2-netinet-in.patch deleted file mode 100644 index 461f50a930c5f..0000000000000 --- a/deps/patches/libssh2-netinet-in.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tests/CMakeLists.txt 2016-10-24 23:43:39.000000000 -0700 -+++ tests/CMakeLists.txt 2016-11-15 20:44:32.132344000 -0800 -@@ -47,6 +47,7 @@ - check_include_files(arpa/inet.h HAVE_ARPA_INET_H) - check_include_files(windows.h HAVE_WINDOWS_H) - check_include_files(winsock2.h HAVE_WINSOCK2_H) -+check_include_files(netinet/in.h HAVE_NETINET_IN_H) - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/libssh2_config_cmake.h.in" - "${CMAKE_CURRENT_BINARY_DIR}/libssh2_config.h")