[libssh] Update libssh to version 0.9.3 #4983

cryptomilk · 2018-12-16T11:58:12Z

This updates libssh to the lastest release. libssh 0.7.x is in security bugfix only mode.

msftclas · 2018-12-16T11:58:23Z

All CLA requirements met.

Codiferous · 2019-02-07T19:25:37Z

@cryptomilk Sorry for the delay in processing this PR.

We're seeing regressions on x64-linux and x64-osx. The failures look like this:

# x64-linux
/usr/bin/cc -DLIBSSH_EXPORTS -Isrc -I/s/buildtrees/libssh/src/0.8.5-531fc45269/src -I/s/buildtrees/libssh/src/0.8.5-531fc45269/include -I. -I/s/installed/x64-linux/include -fPIC -g -fPIC   -fvisibility=hidden -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Wimplicit-fallthrough -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wformat -Wformat-security -Werror=format-security -Wno-gnu-zero-variadic-macro-arguments -fno-common -fstack-protector-strong -MD -MT src/CMakeFiles/ssh_shared.dir/libcrypto.c.o -MF src/CMakeFiles/ssh_shared.dir/libcrypto.c.o.d -o src/CMakeFiles/ssh_shared.dir/libcrypto.c.o   -c /s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c: In function ‘evp_cipher_init’:
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c:501:26: error: implicit declaration of function ‘EVP_bf_cbc’; did you mean ‘EVP_rc2_cbc’? [-Werror=implicit-function-declaration]
         cipher->cipher = EVP_bf_cbc();
                          ^~~~~~~~~~
                          EVP_rc2_cbc
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c:501:24: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
         cipher->cipher = EVP_bf_cbc();
                        ^
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c: In function ‘aes_ctr_encrypt’:
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c:635:3: error: implicit declaration of function ‘CRYPTO_ctr128_encrypt’; did you mean ‘AES_ctr128_encrypt’? [-Werror=implicit-function-declaration]
   CRYPTO_ctr128_encrypt(in, out, len, &cipher->aes_key->key, cipher->aes_key->IV, tmp_buffer, &num, (block128_f)AES_encrypt);
   ^~~~~~~~~~~~~~~~~~~~~
   AES_ctr128_encrypt
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c:635:102: error: ‘block128_f’ undeclared (first use in this function); did you mean ‘lockf’?
   CRYPTO_ctr128_encrypt(in, out, len, &cipher->aes_key->key, cipher->aes_key->IV, tmp_buffer, &num, (block128_f)AES_encrypt);
                                                                                                      ^~~~~~~~~~
                                                                                                      lockf
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c:635:102: note: each undeclared identifier is reported only once for each function it appears in
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c:635:113: error: expected ‘)’ before ‘AES_encrypt’
   CRYPTO_ctr128_encrypt(in, out, len, &cipher->aes_key->key, cipher->aes_key->IV, tmp_buffer, &num, (block128_f)AES_encrypt);
                                                                                                                 ^~~~~~~~~~~

# x64-osx
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc  -Isrc -I/s/buildtrees/libssh/src/0.8.5-531fc45269/src -I/s/buildtrees/libssh/src/0.8.5-531fc45269/include -I. -I/s/installed/x64-osx/include -fPIC -g -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -fPIC   -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Wimplicit-fallthrough -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wformat -Wformat-security -Werror=format-security -Wno-gnu-zero-variadic-macro-arguments -fno-common -fstack-protector-strong -Wno-deprecated-declarations -MD -MT src/CMakeFiles/ssh_static.dir/libcrypto.c.o -MF src/CMakeFiles/ssh_static.dir/libcrypto.c.o.d -o src/CMakeFiles/ssh_static.dir/libcrypto.c.o   -c /s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c:501:26: error: implicit declaration of function 'EVP_bf_cbc' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
        cipher->cipher = EVP_bf_cbc();
                         ^
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c:501:26: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
/s/buildtrees/libssh/src/0.8.5-531fc45269/src/libcrypto.c:501:24: warning: incompatible integer to pointer conversion assigning to 'const EVP_CIPHER *' (aka 'const struct evp_cipher_st *') from 'int' [-Wint-conversion]
        cipher->cipher = EVP_bf_cbc();

I believe all of the errors are related to types and functions defined in OpenSSL. Does OpenSSL need to be updated to coincide with this PR?

fcharlie · 2019-02-16T13:19:53Z

@cryptomilk @ras0219-msft @Codiferous
I think vcpkg should upgrade openssl to 1.1.1a first, or switch Libssh to depend with mbedTLS.

Rastaban · 2019-05-02T23:23:15Z

Resolved merge conflict. The latest master introduced a new patch that may not be applicable after this PR but I did the safe thing and kept it until it is tested.

Rastaban · 2019-05-06T17:12:30Z

Also the patch did not apply cleanly so it will need to be cleaned up. OpenSSL has not been updated yet so those failues are also still there.

grdowns · 2019-07-01T19:53:36Z

/azp run

azure-pipelines · 2019-07-01T19:53:41Z

Pull request contains merge conflicts.

cryptomilk · 2019-07-03T08:29:30Z

I'm not sure what is the error on Linux. However I found an issue in libssh we should fix first. Will update the PR to libssh 0.9.1 once I've fixed it and did a release.

cryptomilk · 2019-07-04T15:25:32Z

As OpenSSL is only in version 1.0.x available I've moved it to mbedtls for now.

NancyLi1013 · 2020-01-14T02:17:15Z

Hi @cryptomilk
Could you please solve the conflicts about this PR?

NancyLi1013 · 2020-01-14T02:17:32Z

/azp run

azure-pipelines · 2020-01-14T02:17:37Z

Pull request contains merge conflicts.

fcharlie · 2020-01-14T03:14:14Z

@NancyLi1013 You can push my modifications to this PR: https://github.com/fcharlie/vcpkg/tree/update_libssh

cryptomilk · 2020-01-14T09:13:26Z

Why does someone else gets updates to libssh and this still PR still bit rots?

cryptomilk · 2020-01-20T13:26:29Z

Ping!

NancyLi1013 · 2020-01-22T07:23:22Z

@vicroms
Could you help take a look if this PR can be merged now?
Thanks.

illera88 · 2020-01-27T23:52:39Z

Hi @cryptomilk. Can you please add x86-windows-static. There are a lot of projects that use libssh statically

ports/libssh/portfile.cmake

cryptomilk · 2020-01-28T09:12:36Z

@illera88 Please be more precise of your problem. libssh respects BUILD_SHARED_LIBS, see https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md#choose-either-static-or-shared-binaries

If you have a real problem, please describe it. I don't see an issue.

illera88 · 2020-01-28T22:34:39Z

I thought I was being very clear with my comment.

It seems that static versions can not be built with the current port. ie x86-windows-static x64-windows-static can not be built.

Or did I miss something?

vicroms · 2020-02-01T01:29:48Z

ports/libssh/portfile.cmake


 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
    OPTIONS
-        -DWITH_STATIC_LIB=${WITH_STATIC_LIB}
+        ${FEATURE_OPTIONS}
        -DWITH_EXAMPLES=OFF


You need to pass BUILD_STATIC_LIB=ON when building the static library. This helps reduce the number of post-install clean-up tasks.

set (LIBSSH_BUILD_STATIC OFF) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LIBSSH_BUILD_STATIC ON) endif() vcpkg_configure_cmake( ... -DBUILD_STATIC_LIB=${LIBSSH_BUILD_STATIC} )

After that you can remove these lines:

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

and

if(VCPKG_TARGET_IS_WINDOWS) file(READ ${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake _contents) string(REPLACE ".dll" ".lib" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake "${_contents}") endif()

I'm sorry, but BUILD_STATIC_LIB builds an internal static library which is only used for linking unit tests!

If you want to build a static library, you should use: -DBUILD_SHARED_LIBS=OFF. This is how it is supposed to work. See https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html

If you look at:

https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md#choose-either-static-or-shared-binaries

It states:

By default, vcpkg_configure_cmake() will pass in the appropriate setting for BUILD_SHARED_LIBS

So vcpkg_configure_cmake() should do the right thing. If not it might have a bug ...

@vicroms So either your documentation is wrong or you have a bug in vcpkg_configure_cmake().

ras0219-msft · 2020-02-04T23:51:23Z

This LGTM once the CI build passes 👍

ras0219-msft · 2020-02-06T01:39:05Z

/azp run

ras0219-msft · 2020-02-06T02:19:33Z

Thanks for the PR!

## 1.11.0 (2024-01-11) ### Features Added - Added 'OPTIONS' HTTP method to `Azure::Core::Http::HttpMethod` enum. - Added TLS 1.3 support to WinHTTP transport. - Environment Log Level Listener now logs the ThreadID for the thread originating the trace. - [[microsoft#4983]](Azure/azure-sdk-for-cpp#4983) Added support for setting `CURLOPT_CAPATH` libcurl option on Linux. (A community contribution, courtesy of _[phoebusm](https://github.com/phoebusm)_) ### Bugs Fixed - [[microsoft#5172]](Azure/azure-sdk-for-cpp#5172) `Azure::Nullable::Emplace()` does not set `HasValue()` to `true`. - [[microsoft#5130]](Azure/azure-sdk-for-cpp#5130) `Url::AppendPath()` and `Url::SetPath()` may end up with a double slash at the beginning of a path. - [[microsoft#5007]](Azure/azure-sdk-for-cpp#5007) Some versions of GCC no longer include stdint.h in cstdint. ### Other Changes - [[microsoft#4756]] (Azure/azure-sdk-for-cpp#4756) `BearerTokenAuthenticationPolicy` now uses shared mutex lock for read operations. ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - Phoebus Mak _([GitHub](https://github.com/phoebusm))_

* [azure-messaging-eventhubs-cpp] Update to 1.0.0-beta.5 ## 1.0.0-beta.5 (2024-01-11) ### Breaking Changes - EventHub `ConsumerClient` and `ProcessorClient` objects now return pointers to `EventData` objects instead of `EventData` objects by value. * [azure-core-amqp-cpp] Update to 1.0.0-beta.6 ## 1.0.0-beta.6 (2024-01-11) ### Features Added - AMQP Value reference counts are now atomic, this fixes several AMQP related crashes. ### Breaking Changes - `MessageReceiver` returns a pointer to the received message instead of a copy. ### Bugs Fixed - Fixed several memory leaks. - AMQP Link Credits now work as expected. - Integrated the fix for NVD - CVE-2024-21646. * [azure-core-cpp] Update to 1.11.0 ## 1.11.0 (2024-01-11) ### Features Added - Added 'OPTIONS' HTTP method to `Azure::Core::Http::HttpMethod` enum. - Added TLS 1.3 support to WinHTTP transport. - Environment Log Level Listener now logs the ThreadID for the thread originating the trace. - [[#4983]](Azure/azure-sdk-for-cpp#4983) Added support for setting `CURLOPT_CAPATH` libcurl option on Linux. (A community contribution, courtesy of _[phoebusm](https://github.com/phoebusm)_) ### Bugs Fixed - [[#5172]](Azure/azure-sdk-for-cpp#5172) `Azure::Nullable::Emplace()` does not set `HasValue()` to `true`. - [[#5130]](Azure/azure-sdk-for-cpp#5130) `Url::AppendPath()` and `Url::SetPath()` may end up with a double slash at the beginning of a path. - [[#5007]](Azure/azure-sdk-for-cpp#5007) Some versions of GCC no longer include stdint.h in cstdint. ### Other Changes - [[#4756]] (Azure/azure-sdk-for-cpp#4756) `BearerTokenAuthenticationPolicy` now uses shared mutex lock for read operations. ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - Phoebus Mak _([GitHub](https://github.com/phoebusm))_

* [azure-messaging-eventhubs-cpp] Update to 1.0.0-beta.5 ## 1.0.0-beta.5 (2024-01-11) ### Breaking Changes - EventHub `ConsumerClient` and `ProcessorClient` objects now return pointers to `EventData` objects instead of `EventData` objects by value. * [azure-core-amqp-cpp] Update to 1.0.0-beta.6 ## 1.0.0-beta.6 (2024-01-11) ### Features Added - AMQP Value reference counts are now atomic, this fixes several AMQP related crashes. ### Breaking Changes - `MessageReceiver` returns a pointer to the received message instead of a copy. ### Bugs Fixed - Fixed several memory leaks. - AMQP Link Credits now work as expected. - Integrated the fix for NVD - CVE-2024-21646. * [azure-core-cpp] Update to 1.11.0 ## 1.11.0 (2024-01-11) ### Features Added - Added 'OPTIONS' HTTP method to `Azure::Core::Http::HttpMethod` enum. - Added TLS 1.3 support to WinHTTP transport. - Environment Log Level Listener now logs the ThreadID for the thread originating the trace. - [[microsoft#4983]](Azure/azure-sdk-for-cpp#4983) Added support for setting `CURLOPT_CAPATH` libcurl option on Linux. (A community contribution, courtesy of _[phoebusm](https://github.com/phoebusm)_) ### Bugs Fixed - [[microsoft#5172]](Azure/azure-sdk-for-cpp#5172) `Azure::Nullable::Emplace()` does not set `HasValue()` to `true`. - [[microsoft#5130]](Azure/azure-sdk-for-cpp#5130) `Url::AppendPath()` and `Url::SetPath()` may end up with a double slash at the beginning of a path. - [[microsoft#5007]](Azure/azure-sdk-for-cpp#5007) Some versions of GCC no longer include stdint.h in cstdint. ### Other Changes - [[microsoft#4756]] (Azure/azure-sdk-for-cpp#4756) `BearerTokenAuthenticationPolicy` now uses shared mutex lock for read operations. ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - Phoebus Mak _([GitHub](https://github.com/phoebusm))_

cryptomilk force-pushed the master-libssh branch 3 times, most recently from f5a024d to f5d1815 Compare December 16, 2018 12:11

cryptomilk changed the title ~~Update libssh to version 0.8.5~~ [WIP] Update libssh to version 0.8.5 Dec 16, 2018

ras0219-msft self-assigned this Dec 19, 2018

ras0219-msft assigned Codiferous and unassigned ras0219-msft Feb 7, 2019

Codiferous added the wip label Feb 8, 2019

Codiferous removed their assignment Feb 25, 2019

Rastaban mentioned this pull request Mar 5, 2019

Upgrade OpenSSL to 1.1.1 #4267

Closed

illera88 mentioned this pull request Apr 19, 2019

[libssh] Update the version to 0.8 #5690

Closed

ras0219-msft assigned grdowns Jun 20, 2019

cryptomilk force-pushed the master-libssh branch from 36f4148 to 24761b2 Compare July 3, 2019 07:51

cryptomilk changed the title ~~[WIP] Update libssh to version 0.8.5~~ [WIP] Update libssh to version 0.9.0 Jul 3, 2019

cryptomilk force-pushed the master-libssh branch 6 times, most recently from 4009441 to decd7b9 Compare July 4, 2019 15:20

cryptomilk changed the title ~~[WIP] Update libssh to version 0.9.0~~ Update libssh to version 0.9.0 Jul 4, 2019

NancyLi1013 mentioned this pull request Jan 2, 2020

[libssh] Wrong LIBSSH_LIBRARY variable on Linux #7784

Closed

PhoebeHui added the needs-further-review label Jan 7, 2020

cryptomilk force-pushed the master-libssh branch from 8726548 to 2331409 Compare January 8, 2020 17:52

cryptomilk force-pushed the master-libssh branch from 2331409 to a0841f4 Compare January 14, 2020 09:08

[libssh] Update libssh to version 0.9.3

d502f06

cryptomilk force-pushed the master-libssh branch from a0841f4 to d502f06 Compare January 14, 2020 09:11

PhoebeHui assigned vicroms Jan 16, 2020

illera88 reviewed Jan 27, 2020

View reviewed changes

ports/libssh/portfile.cmake Show resolved Hide resolved

vicroms requested changes Feb 1, 2020

View reviewed changes

ras0219-msft added 2 commits February 4, 2020 15:50

Merge remote-tracking branch 'origin/master' into HEAD

6f66ad1

[libssh] Remove unneeded patch and UWP check

fff8a64

ras0219-msft approved these changes Feb 4, 2020

View reviewed changes

ras0219-msft merged commit 53b4fba into microsoft:master Feb 6, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[libssh] Update libssh to version 0.9.3 #4983

[libssh] Update libssh to version 0.9.3 #4983

cryptomilk commented Dec 16, 2018

msftclas commented Dec 16, 2018 •

edited

Loading

Codiferous commented Feb 7, 2019

fcharlie commented Feb 16, 2019 •

edited

Loading

Rastaban commented May 2, 2019

Rastaban commented May 6, 2019

grdowns commented Jul 1, 2019

azure-pipelines bot commented Jul 1, 2019

cryptomilk commented Jul 3, 2019

cryptomilk commented Jul 4, 2019

NancyLi1013 commented Jan 14, 2020

NancyLi1013 commented Jan 14, 2020

azure-pipelines bot commented Jan 14, 2020

fcharlie commented Jan 14, 2020

cryptomilk commented Jan 14, 2020

cryptomilk commented Jan 20, 2020

NancyLi1013 commented Jan 22, 2020

illera88 commented Jan 27, 2020

cryptomilk commented Jan 28, 2020

illera88 commented Jan 28, 2020

vicroms Feb 1, 2020

cryptomilk Feb 1, 2020

cryptomilk Feb 1, 2020

illera88 Feb 4, 2020

ras0219-msft commented Feb 4, 2020

ras0219-msft commented Feb 6, 2020

ras0219-msft commented Feb 6, 2020

[libssh] Update libssh to version 0.9.3 #4983

[libssh] Update libssh to version 0.9.3 #4983

Conversation

cryptomilk commented Dec 16, 2018

msftclas commented Dec 16, 2018 • edited Loading

Codiferous commented Feb 7, 2019

fcharlie commented Feb 16, 2019 • edited Loading

Rastaban commented May 2, 2019

Rastaban commented May 6, 2019

grdowns commented Jul 1, 2019

azure-pipelines bot commented Jul 1, 2019

cryptomilk commented Jul 3, 2019

cryptomilk commented Jul 4, 2019

NancyLi1013 commented Jan 14, 2020

NancyLi1013 commented Jan 14, 2020

azure-pipelines bot commented Jan 14, 2020

fcharlie commented Jan 14, 2020

cryptomilk commented Jan 14, 2020

cryptomilk commented Jan 20, 2020

NancyLi1013 commented Jan 22, 2020

illera88 commented Jan 27, 2020

cryptomilk commented Jan 28, 2020

illera88 commented Jan 28, 2020

vicroms Feb 1, 2020

Choose a reason for hiding this comment

cryptomilk Feb 1, 2020

Choose a reason for hiding this comment

cryptomilk Feb 1, 2020

Choose a reason for hiding this comment

illera88 Feb 4, 2020

Choose a reason for hiding this comment

ras0219-msft commented Feb 4, 2020

ras0219-msft commented Feb 6, 2020

ras0219-msft commented Feb 6, 2020

msftclas commented Dec 16, 2018 •

edited

Loading

fcharlie commented Feb 16, 2019 •

edited

Loading