libssh: upgrade 0.8.9 -> 0.10.4
PATCH v3 1/4 libssh: upgrade 0.8.9 -> 0.10.4
From: Vijay Anusuri <[email protected]>
ChangeLog:
https://git.libssh.org/projects/libssh.git/tree/CHANGELOG?h=libssh-0.10.4
Drop CVE-2020-16135.patch
---
.../libssh/libssh/CVE-2020-16135.patch | 44 -------------------
.../{libssh_0.8.9.bb => libssh_0.10.4.bb} | 16 ++-----
2 files changed, 3 insertions(+), 57 deletions(-)
delete mode 100644 meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch
rename meta-oe/recipes-support/libssh/{libssh_0.8.9.bb => libssh_0.10.4.bb} (62%)meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0 -44
@@ -1,44 +0,0 @@ -From 0a9268a60f2d3748ca69bde5651f20e72761058c Mon Sep 17 00:00:00 2001 -From: Andreas Schneider <[email protected]> -Date: Wed, 3 Jun 2020 10:04:09 +0200 -Subject: CVE-2020-16135: Add missing NULL check for ssh_buffer_new() - -Add a missing NULL check for the pointer returned by ssh_buffer_new() in -sftpserver.c. - -Thanks to Ramin Farajpour Cami for spotting this. - -Fixes T232 - -Signed-off-by: Andreas Schneider <[email protected]> -Reviewed-by: Anderson Toshiyuki Sasaki <[email protected]> -Reviewed-by: Jakub Jelen <[email protected]> -(cherry picked from commit 533d881b0f4b24c72b35ecc97fa35d295d063e53) - -Upstream-Status: Backport [https://git.libssh.org/projects/libssh.git/patch/?id=0a9268a60f2d3748ca69bde5651f20e72761058c] -CVE: CVE-2020-16135 -Signed-off-by: Hitendra Prajapati <[email protected]> ---- - src/sftpserver.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/sftpserver.c b/src/sftpserver.c -index 1717aa417..1af8a0e76 100644 ---- a/src/sftpserver.c -+++ b/src/sftpserver.c -@@ -64,6 +64,12 @@ sftp_client_message sftp_get_client_message(sftp_session sftp) { - - /* take a copy of the whole packet */ - msg->complete_message = ssh_buffer_new(); -+ if (msg->complete_message == NULL) { -+ ssh_set_error_oom(session); -+ sftp_client_message_free(msg); -+ return NULL; -+ } -+ - ssh_buffer_add_data(msg->complete_message, - ssh_buffer_get(payload), - ssh_buffer_get_len(payload)); --- -2.25.1 -
meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +3 -13
@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" DEPENDS = "zlib openssl" -SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.8 \ - file://CVE-2020-16135.patch \ - " -SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8" +SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10" +SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85" S = "${WORKDIR}/git"
@@ -25,15 +23,7 @@ EXTRA_OECMAKE = " \ -DWITH_PCAP=1 \ -DWITH_SFTP=1 \ -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DWITH_EXAMPLES=0 \ " -do_configure:prepend () { - # Disable building of examples - sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \ - || bbfatal "Failed to disable examples" -} - -TOOLCHAIN = "gcc" - BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.1
PATCH v3 2/4 libssh: add ptest
From: Vijay Anusuri <[email protected]>
Results:
$ ptest-runner libssh START: ptest-runner 2023-03-16T02:56 BEGIN: /usr/lib/libssh/ptest PASS: torture_bind_config PASS: torture_buffer PASS: torture_bytearray PASS: torture_callbacks PASS: torture_channel PASS: torture_config PASS: torture_crypto PASS: torture_hashes PASS: torture_init PASS: torture_isipaddr PASS: torture_keyfiles PASS: torture_knownhosts_parsing PASS: torture_list PASS: torture_misc PASS: torture_moduli PASS: torture_options PASS: torture_packet PASS: torture_packet_filter PASS: torture_pki PASS: torture_pki_ecdsa PASS: torture_pki_ed25519 PASS: torture_pki_rsa PASS: torture_push_pop_dir PASS: torture_rand PASS: torture_session_keys PASS: torture_temp_dir PASS: torture_temp_file PASS: torture_threads_buffer PASS: torture_threads_crypto PASS: torture_threads_init PASS: torture_threads_pki_rsa PASS: torture_tokens DURATION: 24 END: /usr/lib/libssh/ptest 2023-03-16T02:56 STOP: ptest-runner TOTAL: 1 FAIL: 0
--- ....txt-do-not-search-ssh-sshd-commands.patch | 38 +++++++++++++ .../recipes-support/libssh/libssh/run-ptest | 53 +++++++++++++++++++ .../recipes-support/libssh/libssh_0.10.4.bb | 21 ++++++-- 3 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch create mode 100644 meta-oe/recipes-support/libssh/libssh/run-ptest
meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch new file +38 -0
@@ -0,0 +1,38 @@ +From d2525ba0bc7b11de12c54ea1a3d1eb862537136d Mon Sep 17 00:00:00 2001 +From: Yi Zhao <[email protected]> +Date: Wed, 15 Mar 2023 16:51:58 +0800 +Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host + +It will search ssh/sshd commands on host when configure. Since they are +not required by unittests, we can skip the search. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <[email protected]> +--- + tests/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 22a36f37..aa32ca2e 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES + + add_subdirectory(unittests) + ++if (CLIENT_TESTING OR SERVER_TESTING) + # OpenSSH Capabilities are required for all unit tests + find_program(SSH_EXECUTABLE NAMES ssh) + if (SSH_EXECUTABLE) +@@ -293,6 +294,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) + + message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") + endif () ++endif () + + configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) + +-- +2.25.1 +
meta-oe/recipes-support/libssh/libssh/run-ptest new file +53 -0
53 lines not on this page · raw message
meta-oe/recipes-support/libssh/libssh_0.10.4.bb +18 -3
@@ -6,16 +6,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" DEPENDS = "zlib openssl" -SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10" +SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10 \ + file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ + file://run-ptest \ + " SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85" S = "${WORKDIR}/git" -inherit cmake +inherit cmake ptest -PACKAGECONFIG ??= "gcrypt" +PACKAGECONFIG ??= "gcrypt ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, " +PACKAGECONFIG[tests] = "-DUNIT_TESTING=1, -DUNIT_TESTING=0, cmocka" ARM_INSTRUCTION_SET:armv5 = "arm"
@@ -26,4 +30,15 @@ EXTRA_OECMAKE = " \ -DWITH_EXAMPLES=0 \ " +do_compile:prepend () { + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/config.h + fi +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/unittests/torture_* ${D}${PTEST_PATH}/tests/ +} + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.1
PATCH v3 3/4 libssh: Fix build with clang16
In reply to [email protected]From: Vijay Anusuri <[email protected]>
--- ...prototype-of-des3_encrypt-des3_decry.patch | 46 +++++++++++++++++++ .../recipes-support/libssh/libssh_0.10.4.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch
meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch new file +46 -0
@@ -0,0 +1,46 @@ +From 0cade4573334571055127a2d4fe3641e2397948d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 20 Mar 2023 21:59:19 -0700 +Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt + +This is to match the prototype for callback functions which are now emitted as +errors by clang16 + +Fixes + +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:903:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] + .encrypt = des3_encrypt, + ^~~~~~~~~~~~ +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:904:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] + .decrypt = des3_decrypt + ^~~~~~~~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + src/libgcrypt.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libgcrypt.c b/src/libgcrypt.c +index da5588ad..e482b654 100644 +--- a/src/libgcrypt.c ++++ b/src/libgcrypt.c +@@ -469,12 +469,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { + } + + static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in, +- void *out, unsigned long len) { ++ void *out, size_t len) { + gcry_cipher_encrypt(cipher->key[0], out, len, in, len); + } + + static void des3_decrypt(struct ssh_cipher_struct *cipher, void *in, +- void *out, unsigned long len) { ++ void *out, size_t len) { + gcry_cipher_decrypt(cipher->key[0], out, len, in, len); + } + +-- +2.40.0 +
meta-oe/recipes-support/libssh/libssh_0.10.4.bb +1 -0
@@ -8,6 +8,7 @@ DEPENDS = "zlib openssl" SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10 \ file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ + file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ file://run-ptest \ " SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85"
Signature · 1 line
2.25.1
PATCH v3 4/4 libssh: upgrade 0.10.4 -> 0.10.5
In reply to [email protected]From: Vijay Anusuri <[email protected]>
Changelog:
https://git.libssh.org/projects/libssh.git/tag/?h=libssh-0.10.5
* Generate cases list dynamically in run-ptest.
* Install missing file to fix ptest failure.
---
.../recipes-support/libssh/libssh/run-ptest | 42 ++-----------------
.../{libssh_0.10.4.bb => libssh_0.10.5.bb} | 5 ++-
2 files changed, 7 insertions(+), 40 deletions(-)
rename meta-oe/recipes-support/libssh/{libssh_0.10.4.bb => libssh_0.10.5.bb} (85%)meta-oe/recipes-support/libssh/libssh/run-ptest +3 -39
@@ -1,53 +1,17 @@ #!/bin/sh -# Valid tests to run -tests="torture_bind_config \ - torture_buffer \ - torture_bytearray \ - torture_callbacks \ - torture_channel \ - torture_config \ - torture_crypto \ - torture_hashes \ - torture_init \ - torture_isipaddr \ - torture_keyfiles \ - torture_knownhosts_parsing \ - torture_list \ - torture_misc \ - torture_moduli \ - torture_options \ - torture_packet \ - torture_packet_filter \ - torture_pki \ - torture_pki_ecdsa \ - torture_pki_ed25519 \ - torture_pki_rsa \ - torture_push_pop_dir \ - torture_rand \ - torture_session_keys \ - torture_temp_dir \ - torture_temp_file \ - torture_threads_buffer \ - torture_threads_crypto \ - torture_threads_init \ - torture_threads_pki_rsa \ - torture_tokens \ - " - ptestdir=$(dirname "$(readlink -f "$0")") cd "$ptestdir"/tests || exit -# Run specified tests +tests=$(find * -type f -name 'torture_*') + for f in $tests do - if test -e ./"$f"; then + if test -x ./"$f"; then if ./"$f" > ./"$f".out 2> ./"$f".err; then echo "PASS: $f" else echo "FAIL: $f" fi - else - echo "SKIP: $f" fi done
meta-oe/recipes-support/libssh/libssh_0.10.5.bb renamed from meta-oe/recipes-support/libssh/libssh_0.10.4.bb +4 -1
@@ -11,7 +11,7 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ file://run-ptest \ " -SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85" +SRCREV = "479eca13aaaa46b43e68c52186e3783f06ae6f34" S = "${WORKDIR}/git"
@@ -34,12 +34,15 @@ EXTRA_OECMAKE = " \ do_compile:prepend () { if [ ${PTEST_ENABLED} = "1" ]; then sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/config.h + sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/config.h fi } do_install_ptest () { install -d ${D}${PTEST_PATH}/tests cp -f ${B}/tests/unittests/torture_* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/unittests + cp -f ${S}/tests/unittests/hello*.sh ${D}${PTEST_PATH}/tests/unittests/ } BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [oe] [meta-oe][kirkstone][PATCH v3 4/4] libssh: upgrade 0.10.4 -> 0.10.5
Hi Armin,
Any update on this ?
Thanks & Regards,
Vijay
Quoted 134 lines · Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri <[email protected]>
Changelog:
https://git.libssh.org/projects/libssh.git/tag/?h=libssh-0.10.5* Generate cases list dynamically in run-ptest.
* Install missing file to fix ptest failure.Signed-off-by Yi Zhao <[email protected]>Signed-off-by Vijay Anusuri <[email protected]>--- .../recipes-support/libssh/libssh/run-ptest | 42 ++----------------- .../{libssh_0.10.4.bb => libssh_0.10.5.bb} | 5 ++- 2 files changed, 7 insertions(+), 40 deletions(-) rename meta-oe/recipes-support/libssh/{libssh_0.10.4.bb =>libssh_0.10.5.bb} (85%)
meta-oe/recipes-support/libssh/libssh/run-ptest +3
-39@@ -1,53 +1,17 @@ #!/bin/sh -# Valid tests to run -tests="torture_bind_config \ - torture_buffer \ - torture_bytearray \ - torture_callbacks \ - torture_channel \ - torture_config \ - torture_crypto \ - torture_hashes \ - torture_init \ - torture_isipaddr \ - torture_keyfiles \ - torture_knownhosts_parsing \ - torture_list \ - torture_misc \ - torture_moduli \ - torture_options \ - torture_packet \ - torture_packet_filter \ - torture_pki \ - torture_pki_ecdsa \ - torture_pki_ed25519 \ - torture_pki_rsa \ - torture_push_pop_dir \ - torture_rand \ - torture_session_keys \ - torture_temp_dir \ - torture_temp_file \ - torture_threads_buffer \ - torture_threads_crypto \ - torture_threads_init \ - torture_threads_pki_rsa \ - torture_tokens \ - " - ptestdir=$(dirname "$(readlink -f "$0")") cd "$ptestdir"/tests || exit -# Run specified tests +tests=$(find * -type f -name 'torture_*') + for f in $tests do - if test -e ./"$f"; then + if test -x ./"$f"; then if ./"$f" > ./"$f".out 2> ./"$f".err; then echo "PASS: $f" else echo "FAIL: $f" fi - else - echo "SKIP: $f" fi donemeta-oe/recipes-support/libssh/libssh_0.10.5.bb renamed from meta-oe/recipes-support/libssh/libssh_0.10.4.bb +0
-0@@ -11,7 +11,7 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable
file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ file://run-ptest \ "meta-oe/recipes-support/libssh/libssh_0.10.5.bb renamed from meta-oe/recipes-support/libssh/libssh_0.10.4.bb +4
-1-SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85" +SRCREV = "479eca13aaaa46b43e68c52186e3783f06ae6f34" S = "${WORKDIR}/git"@@ -34,12 +34,15 @@ EXTRA_OECMAKE = " \ do_compile:prepend () { if [ ${PTEST_ENABLED} = "1" ]; then sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/config.h + sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/config.h fi } do_install_ptest () { install -d ${D}${PTEST_PATH}/tests cp -f ${B}/tests/unittests/torture_* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/unittests + cp -f ${S}/tests/unittests/hello*.sh${D}${PTEST_PATH}/tests/unittests/
}BBCLASSEXTEND = "native nativesdk"
--
2.25.1-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#107653):
https://lists.openembedded.org/g/openembedded-devel/message/107653
Mute This Topic: https://lists.openembedded.org/mt/103278130/7301997
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 4 lines · Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri <[email protected]>
ChangeLog:
https://git.libssh.org/projects/libssh.git/tree/CHANGELOG?h=libssh-0.10.4
I don't think this is allowed as per stable branch policy unless this is a bug fix only upgrade.
Thanks,
Anuj
Quoted 130 lines
Drop CVE-2020-16135.patch
Signed-off-by Vijay Anusuri <[email protected]>---
.../libssh/libssh/CVE-2020-16135.patch | 44 ----------------- --
.../{libssh_0.8.9.bb => libssh_0.10.4.bb} | 16 ++-----2 files changed, 3 insertions(+), 57 deletions(-)delete mode 100644 meta-oe/recipes-support/libssh/libssh/CVE-2020- 16135.patch
rename meta-oe/recipes-support/libssh/{libssh_0.8.9.bb => libssh_0.10.4.bb} (62%)(quoted diff) +0
-016135.patch b/meta-oe/recipes-support/libssh/libssh/CVE-2020- 16135.patch
deleted file mode 100644
index 63b78688d..000000000meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-1@@ -1,44 +0,0 @@ -From 0a9268a60f2d3748ca69bde5651f20e72761058c Mon Sep 17 00:00:002001
meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-5-From: Andreas Schneider <[email protected]> -Date: Wed, 3 Jun 2020 10:04:09 +0200 -Subject: CVE-2020-16135: Add missing NULL check for ssh_buffer_new() - -Add a missing NULL check for the pointer returned by
ssh_buffer_new()inmeta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-12-sftpserver.c. - -Thanks to Ramin Farajpour Cami for spotting this. - -Fixes T232 - -Signed-off-by: Andreas Schneider <[email protected]> -Reviewed-by: Anderson Toshiyuki Sasaki <[email protected]> -Reviewed-by: Jakub Jelen <[email protected]> -(cherry picked from commit 533d881b0f4b24c72b35ecc97fa35d295d063e53) - -Upstream-Status: Backport[https://git.libssh.org/projects/libssh.git/patch/?id=0a9268a60f2d374
8ca69bde5651f20e72761058c]meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-11-CVE: CVE-2020-16135 -Signed-off-by: Hitendra Prajapati <[email protected]> ---- - src/sftpserver.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/sftpserver.c b/src/sftpserver.c -index 1717aa417..1af8a0e76 100644 ---- a/src/sftpserver.c -+++ b/src/sftpserver.c -@@ -64,6 +64,12 @@ sftp_client_message
sftp_get_client_message(sftp_session sftp){ -
- /* take a copy of the whole packet */
-msg->complete_message=ssh_buffer_new(); -+ if (msg->complete_message== NULL) {
-+ssh_set_error_oom(session);
-+sftp_client_message_free(msg);
-+ return NULL;
-+ }
-+
- ssh_buffer_add_data(msg->complete_message, -ssh_buffer_get(payload), -ssh_buffer_get_len(payload));
---
-2.25.1meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-1-meta- renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-0oe/recipes-support/libssh/libssh_0.10.4.bb similarity index 62%
rename from meta-oe/recipes-support/libssh/libssh_0.8.9.bb rename to meta-oe/recipes-support/libssh/libssh_0.10.4.bb index061f13912..3a57a728a100644meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-0@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
DEPENDS = "zlib openssl"
-SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.8 \
- file://CVE-2020-16135.patch \
- "meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +1
-1-SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8" +SRC_URI ="
git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10"
+SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85"
S = "${WORKDIR}/git"meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +1
-1@@ -25,15 +23,7 @@ EXTRA_OECMAKE = " \ -DWITH_PCAP=1 \ -DWITH_SFTP=1 \ -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DWITH_EXAMPLES=0 \"
-do_configure:prepend () {
- # Disable building of examples
- sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/'${S}/CMakeLists.txt\
- || bbfatal "Failed to disable examples"meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-4-} - -TOOLCHAIN = "gcc" -BBCLASSEXTEND = "native nativesdk"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#107650):
https://lists.openembedded.org/g/openembedded-devel/message/107650
Mute This Topic: https://lists.openembedded.org/mt/103278127/3616702
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-devel/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Anuj,
I thought of updating libssh to 0.10.6 to fix the below security bugs
* Fix CVE-2023-6004: Command injection using proxycommand
* Fix CVE-2023-48795: Potential downgrade attack using strict kex
* Fix CVE-2023-6918: Missing checks for return values of MD functions
Ref: https://lists.openembedded.org/g/openembedded-devel/message/107993
(libssh update to 0.10.6 for master branch)
Now I have to go with backporting the fixes instead of upgrading?
Thanks & Regards,
Vijay
Quoted 148 lines · Anuj
Quoted 4 lines · Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri <[email protected]>
ChangeLog:
https://git.libssh.org/projects/libssh.git/tree/CHANGELOG?h=libssh-0.10.4
I don't think this is allowed as per stable branch policy unless this is a bug fix only upgrade.
Thanks,
Anuj
Quoted 5 lines
Drop CVE-2020-16135.patch
Ref:
Quoted 125 lines
Signed-off-by Vijay Anusuri <[email protected]>--- .../libssh/libssh/CVE-2020-16135.patch | 44 ----------------- -- .../{libssh_0.8.9.bb => libssh_0.10.4.bb} | 16 ++----- 2 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 meta-oe/recipes-support/libssh/libssh/CVE-2020- 16135.patch rename meta-oe/recipes-support/libssh/{libssh_0.8.9.bb =>libssh_0.10.4.bb} (62%)
(quoted diff) +0
-016135.patch b/meta-oe/recipes-support/libssh/libssh/CVE-2020- 16135.patch
deleted file mode 100644
index 63b78688d..000000000meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-1@@ -1,44 +0,0 @@ -From 0a9268a60f2d3748ca69bde5651f20e72761058c Mon Sep 17 00:00:002001
meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-5-From: Andreas Schneider <[email protected]> -Date: Wed, 3 Jun 2020 10:04:09 +0200 -Subject: CVE-2020-16135: Add missing NULL check for ssh_buffer_new() - -Add a missing NULL check for the pointer returned by
ssh_buffer_new()inmeta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-12-sftpserver.c. - -Thanks to Ramin Farajpour Cami for spotting this. - -Fixes T232 - -Signed-off-by: Andreas Schneider <[email protected]> -Reviewed-by: Anderson Toshiyuki Sasaki <[email protected]> -Reviewed-by: Jakub Jelen <[email protected]> -(cherry picked from commit 533d881b0f4b24c72b35ecc97fa35d295d063e53) - -Upstream-Status: Backport[https://git.libssh.org/projects/libssh.git/patch/?id=0a9268a60f2d374
8ca69bde5651f20e72761058c]meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-11-CVE: CVE-2020-16135 -Signed-off-by: Hitendra Prajapati <[email protected]> ---- - src/sftpserver.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/sftpserver.c b/src/sftpserver.c -index 1717aa417..1af8a0e76 100644 ---- a/src/sftpserver.c -+++ b/src/sftpserver.c -@@ -64,6 +64,12 @@ sftp_client_message
sftp_get_client_message(sftp_session sftp){meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-15- - /* take a copy of the whole packet */ - msg->complete_message = ssh_buffer_new(); -+ if (msg->complete_message == NULL) { -+ ssh_set_error_oom(session); -+ sftp_client_message_free(msg); -+ return NULL; -+ } -+ - ssh_buffer_add_data(msg->complete_message, - ssh_buffer_get(payload), - ssh_buffer_get_len(payload)); --- -2.25.1 -meta- renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-0oe/recipes-support/libssh/libssh_0.10.4.bb similarity index 62%
rename from meta-oe/recipes-support/libssh/libssh_0.8.9.bb rename to meta-oe/recipes-support/libssh/libssh_0.10.4.bb index061f13912..3a57a728a100644meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-0@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
DEPENDS = "zlib openssl"
-SRC_URI = "
git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.8 \meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +1
-3- file://CVE-2020-16135.patch \ - " -SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8" +SRC_URI ="
git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10"meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +2
-9+SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85" S = "${WORKDIR}/git"@@ -25,15 +23,7 @@ EXTRA_OECMAKE = " \ -DWITH_PCAP=1 \ -DWITH_SFTP=1 \ -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DWITH_EXAMPLES=0 \ " -do_configure:prepend () { - # Disable building of examples - sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \ - || bbfatal "Failed to disable examples" -} - -TOOLCHAIN = "gcc" -BBCLASSEXTEND = "native nativesdk"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#107650):
https://lists.openembedded.org/g/openembedded-devel/message/107650
Mute This Topic: https://lists.openembedded.org/mt/103278127/3616702
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 8 lines · Vijay Anusuri via lists.openembedded.org
Hi Anuj,
I thought of updating libssh to 0.10.6 to fix the below security bugs
* Fix CVE-2023-6004: Command injection using proxycommand
* Fix CVE-2023-48795: Potential downgrade attack using strict kex
* Fix CVE-2023-6918: Missing checks for return values of MD functions
Quoted 5 lines
Ref:
https://lists.openembedded.org/g/openembedded-devel/message/107993
(libssh update to 0.10.6 for master branch)Now I have to go with backporting the fixes instead of upgrading?
Yes, that is the policy.
https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS#Stable/LTS_Patch_Acceptance_Policies
Thanks,
Anuj
Quoted 167 lines
Thanks & Regards,
VijayQuoted 138 lines · Anuj
Quoted 4 lines · Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri <[email protected]>
ChangeLog:
https://git.libssh.org/projects/libssh.git/tree/CHANGELOG?h=libssh-0.10.4I don't think this is allowed as per stable branch policy unless this
is a bug fix only upgrade.Thanks,
Anuj
Quoted 123 lines
Drop CVE-2020-16135.patch
Signed-off-by Vijay Anusuri <[email protected]>---
.../libssh/libssh/CVE-2020-16135.patch | 44 -------------
----
--
.../{libssh_0.8.9.bb => libssh_0.10.4.bb} | 16 ++-----2 files changed, 3 insertions(+), 57 deletions(-)delete mode 100644 meta-oe/recipes-support/libssh/libssh/CVE- 2020-
16135.patch
rename meta-oe/recipes-support/libssh/{libssh_0.8.9.bb => libssh_0.10.4.bb} (62%)(quoted diff) +0
-016135.patch b/meta-oe/recipes-support/libssh/libssh/CVE-2020- 16135.patch
deleted file mode 100644
index 63b78688d..000000000meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-1@@ -1,44 +0,0 @@ -From 0a9268a60f2d3748ca69bde5651f20e72761058c Mon Sep 1700:00:00
2001meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-3-From: Andreas Schneider <[email protected]> -Date: Wed, 3 Jun 2020 10:04:09 +0200 -Subject: CVE-2020-16135: Add missing NULL check for
ssh_buffer_new()meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-2- -Add a missing NULL check for the pointer returned by
ssh_buffer_new()inmeta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-10-sftpserver.c. - -Thanks to Ramin Farajpour Cami for spotting this. - -Fixes T232 - -Signed-off-by: Andreas Schneider <[email protected]> -Reviewed-by: Anderson Toshiyuki Sasaki <[email protected]> -Reviewed-by: Jakub Jelen <[email protected]> -(cherry picked from commit
533d881b0f4b24c72b35ecc97fa35d295d063e53)meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-2- -Upstream-Status: Backport[
https://git.libssh.org/projects/libssh.git/patch/?id=0a9268a60f2d3
748ca69bde5651f20e72761058c]meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-11-CVE: CVE-2020-16135 -Signed-off-by: Hitendra Prajapati <[email protected]> ---- - src/sftpserver.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/sftpserver.c b/src/sftpserver.c -index 1717aa417..1af8a0e76 100644 ---- a/src/sftpserver.c -+++ b/src/sftpserver.c -@@ -64,6 +64,12 @@ sftp_client_message
sftp_get_client_message(sftp_session sftp){ -
- /* take a copy of the whole packet */
-msg->complete_message=ssh_buffer_new(); -+ if (msg->complete_message== NULL) {
-+ssh_set_error_oom(session);
-+sftp_client_message_free(msg);
-+ return NULL;
-+ }
-+
- ssh_buffer_add_data(msg->complete_message, -ssh_buffer_get(payload), -ssh_buffer_get_len(payload));
---
-2.25.1meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-1-meta- renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-0oe/recipes-support/libssh/libssh_0.10.4.bb similarity index 62%
rename from meta-oe/recipes-support/libssh/libssh_0.8.9.bb rename to meta-oe/recipes-support/libssh/libssh_0.10.4.bb index061f13912..3a57a728a100644meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-0@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
DEPENDS = "zlib openssl"
-SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stabl
e-0.8 \
- file://CVE-2020-16135.patch \
- "meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +1
-1-SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8" +SRC_URI ="
git://git.libssh.org/projects/libssh.git;protocol=https;branch=stabl
e-0.10"
+SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85"
S = "${WORKDIR}/git"meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +1
-1@@ -25,15 +23,7 @@ EXTRA_OECMAKE = " \ -DWITH_PCAP=1 \ -DWITH_SFTP=1 \ -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DWITH_EXAMPLES=0 \"
-do_configure:prepend () {
- # Disable building of examples
- sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/'${S}/CMakeLists.txt\
- || bbfatal "Failed to disable examples"Quoted 9 lines
Quoted 8 lines
meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-4-} - -TOOLCHAIN = "gcc" -BBCLASSEXTEND = "native nativesdk"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#108083):
https://lists.openembedded.org/g/openembedded-devel/message/108083
Mute This Topic: https://lists.openembedded.org/mt/103278127/3616702
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-devel/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Thanks Anuj for the information provided
Thanks & Regards,
Vijay
Quoted 196 lines · Anuj
Quoted 8 lines · Vijay Anusuri via lists.openembedded.org
Hi Anuj,
I thought of updating libssh to 0.10.6 to fix the below security bugs
* Fix CVE-2023-6004: Command injection using proxycommand
* Fix CVE-2023-48795: Potential downgrade attack using strict kex
* Fix CVE-2023-6918: Missing checks for return values of MD functionsQuoted 5 lines
Ref:
https://lists.openembedded.org/g/openembedded-devel/message/107993
(libssh update to 0.10.6 for master branch)Now I have to go with backporting the fixes instead of upgrading?
Yes, that is the policy.
https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS#Stable/LTS_Patch_Acceptance_Policies
Thanks,
Anuj
Quoted 14 lines
Thanks & Regards,
VijayQuoted 6 lines · Anuj
Quoted 4 lines · Vijay Anusuri via lists.openembedded.org
From: Vijay Anusuri <[email protected]>
ChangeLog:
https://git.libssh.org/projects/libssh.git/tree/CHANGELOG?h=libssh-0.10.4
Quoted 7 lines
Quoted 7 lines
I don't think this is allowed as per stable branch policy unless this
is a bug fix only upgrade.Thanks,
Quoted 7 lines
Quoted 7 lines
Anuj
Quoted 5 lines
Drop CVE-2020-16135.patch
Ref:
Quoted 139 lines
Quoted 113 lines
Quoted 113 lines
Signed-off-by Vijay Anusuri <[email protected]>--- .../libssh/libssh/CVE-2020-16135.patch | 44 ------------- ---- -- .../{libssh_0.8.9.bb => libssh_0.10.4.bb} | 16 ++----- 2 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 meta-oe/recipes-support/libssh/libssh/CVE- 2020- 16135.patch rename meta-oe/recipes-support/libssh/{libssh_0.8.9.bb =>libssh_0.10.4.bb} (62%)
(quoted diff) +0
-016135.patch b/meta-oe/recipes-support/libssh/libssh/CVE-2020- 16135.patch
deleted file mode 100644
index 63b78688d..000000000meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-1@@ -1,44 +0,0 @@ -From 0a9268a60f2d3748ca69bde5651f20e72761058c Mon Sep 1700:00:00
2001meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-3-From: Andreas Schneider <[email protected]> -Date: Wed, 3 Jun 2020 10:04:09 +0200 -Subject: CVE-2020-16135: Add missing NULL check for
ssh_buffer_new()meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-2- -Add a missing NULL check for the pointer returned by
ssh_buffer_new()inmeta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-10-sftpserver.c. - -Thanks to Ramin Farajpour Cami for spotting this. - -Fixes T232 - -Signed-off-by: Andreas Schneider <[email protected]> -Reviewed-by: Anderson Toshiyuki Sasaki <[email protected]> -Reviewed-by: Jakub Jelen <[email protected]> -(cherry picked from commit
533d881b0f4b24c72b35ecc97fa35d295d063e53)meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-2- -Upstream-Status: Backport[
https://git.libssh.org/projects/libssh.git/patch/?id=0a9268a60f2d3
748ca69bde5651f20e72761058c]meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-11-CVE: CVE-2020-16135 -Signed-off-by: Hitendra Prajapati <[email protected]> ---- - src/sftpserver.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/sftpserver.c b/src/sftpserver.c -index 1717aa417..1af8a0e76 100644 ---- a/src/sftpserver.c -+++ b/src/sftpserver.c -@@ -64,6 +64,12 @@ sftp_client_message
sftp_get_client_message(sftp_session sftp){meta-oe/recipes-support/libssh/libssh/CVE-2020-16135.patch deleted +0
-15- - /* take a copy of the whole packet */ - msg->complete_message = ssh_buffer_new(); -+ if (msg->complete_message == NULL) { -+ ssh_set_error_oom(session); -+ sftp_client_message_free(msg); -+ return NULL; -+ } -+ - ssh_buffer_add_data(msg->complete_message, - ssh_buffer_get(payload), - ssh_buffer_get_len(payload)); --- -2.25.1 -meta- renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-0oe/recipes-support/libssh/libssh_0.10.4.bb similarity index 62%
rename from meta-oe/recipes-support/libssh/libssh_0.8.9.bb rename to meta-oe/recipes-support/libssh/libssh_0.10.4.bb index061f13912..3a57a728a100644meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-0@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
DEPENDS = "zlib openssl"
-SRC_URI = "
git://git.libssh.org/projects/libssh.git;protocol=https;branch=stabl
e-0.8 \meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +1
-3- file://CVE-2020-16135.patch \ - " -SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8" +SRC_URI ="
git://git.libssh.org/projects/libssh.git;protocol=https;branch=stabl
e-0.10"meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +2
-1+SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85" S = "${WORKDIR}/git"@@ -25,15 +23,7 @@ EXTRA_OECMAKE = " \ -DWITH_PCAP=1 \ -DWITH_SFTP=1 \ -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DWITH_EXAMPLES=0 \ "Quoted 14 lines
Quoted 9 lines
meta-oe/recipes-support/libssh/libssh_0.10.4.bb renamed from meta-oe/recipes-support/libssh/libssh_0.8.9.bb +0
-8-do_configure:prepend () { - # Disable building of examples - sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \ - || bbfatal "Failed to disable examples" -} - -TOOLCHAIN = "gcc" -Quoted 4 lines
BBCLASSEXTEND = "native nativesdk"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#108083):
https://lists.openembedded.org/g/openembedded-devel/message/108083
Mute This Topic: https://lists.openembedded.org/mt/103278127/3616702
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-