Skip to contentSkip to conversation

package/libssh2: bump version

PATCH New Bernd Kuhls 3 participants 7 messages Sep 11, 2018 – Sep 16, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libssh2: bump version

Added license hash.

This bump includes "ECDSA key types are now explicit"
https://github.com/libssh2/libssh2/commit/62b825c8afb9e5efb6ea9c05b40b309590249fb6

which is needed by vlc since
http://git.videolan.org/?p=vlc.git;a=commitdiff;h=afee1e72a8e08866bbe35d1a57e859cac81052b4

Fixes
http://autobuild.buildroot.net/results/579/579e2418e59680ad4bf3dc85f2918457b6221bfa/
http://autobuild.buildroot.net/results/c73/c7348c442d3f585ace0bc62860f802dc08150776/
http://autobuild.buildroot.net/results/731/73187b883d7fe14b08a4903b326706c9d1f8b519/
http://autobuild.buildroot.net/results/f6d/f6d4fca6063c81a8e240fed4db89269e455f057e/
http://autobuild.buildroot.net/results/371/371f4f017f4a5af0ac6d6a8b1b8276858ad47f75/
http://autobuild.buildroot.net/results/d6a/d6a3b43211eb740bdebbb339668b854d26e878b7/
http://autobuild.buildroot.net/results/a05/a0576aeeb57a49958e5229d9ec08f2bd792d48b6/
http://autobuild.buildroot.net/results/57a/57a9ae2f157183a86fbf1b2cc5cbb38e948690ce/

---
 package/libssh2/libssh2.hash | 3 ++-
 package/libssh2/libssh2.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
package/libssh2/libssh2.hash +2 -1
index d36262ad9a..d57c8d7062 100644
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 e73d55cd512863aa6423c6e137039e3e1bcbf5ba87f130e7441132c2c78a5425 libssh2-616fd4d1b3e4a55de67c48819fefca83132126b5.tar.gz
+sha256 ec2b32b44ae5f8fe094f663f63953fb31314de838eb36e8c47e5a89137b5a1bc  libssh2-8b870ad771cbd9cd29edbb3dbb0878e950f868ab.tar.gz
+sha256 e15ed284a15e80115467d6d7f030f0d89d8fabbecd78fb6e0f861f0cfc128fd9  COPYING
package/libssh2/libssh2.mk +1 -1
index c5b0bd855e..0e13701b29 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSSH2_VERSION = 616fd4d1b3e4a55de67c48819fefca83132126b5
+LIBSSH2_VERSION = 8b870ad771cbd9cd29edbb3dbb0878e950f868ab
 LIBSSH2_SITE = $(call github,libssh2,libssh2,$(LIBSSH2_VERSION))
 LIBSSH2_LICENSE = BSD
 LIBSSH2_LICENSE_FILES = COPYING
Signature · 1 line
2.18.0
#1 lore raw

PATCH 1/1 package/libssh2: bump version

#2 lore raw

PATCH 1/1 package/libssh2: bump version

In reply to Bernd Kuhls

Hello,

package/libssh2/libssh2.mk line 7

Quoted 2 lines · Bernd Kuhls
package/libssh2/libssh2.mk +1 -1
-LIBSSH2_VERSION = 616fd4d1b3e4a55de67c48819fefca83132126b5
+LIBSSH2_VERSION = 8b870ad771cbd9cd29edbb3dbb0878e950f868ab

Looks like this new version has issues:

http://autobuild.buildroot.net/?reason=libssh2-8b870ad771cbd9cd29edbb3dbb0878e950f868ab

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 package/libssh2: bump version

Am Wed, 12 Sep 2018 16:33:44 +0200 schrieb Thomas Petazzoni:

Quoted 10 lines

Hello,

package/libssh2/libssh2.mk line 7

Quoted 2 lines · Bernd Kuhls
package/libssh2/libssh2.mk +1 -1
-LIBSSH2_VERSION = 616fd4d1b3e4a55de67c48819fefca83132126b5
+LIBSSH2_VERSION = 8b870ad771cbd9cd29edbb3dbb0878e950f868ab

Looks like this new version has issues:

http://autobuild.buildroot.net/?

reason=libssh2-8b870ad771cbd9cd29edbb3dbb0878e950f868ab

Quoted 2 lines

Thomas

Hi Thomas,

tried both defconfigs from Sep, 12th, both build without issues. I can not reproduce the problem here (Debian buster), sorry.

Regards, Bernd

#4 lore raw

PATCH 1/1 package/libssh2: bump version

Hello,

Il 13/09/2018 08:16, Bernd Kuhls ha scritto:

Quoted 12 lines

Am Wed, 12 Sep 2018 16:33:44 +0200 schrieb Thomas Petazzoni:

Quoted 10 lines

Hello,

package/libssh2/libssh2.mk line 7

Quoted 2 lines · Bernd Kuhls
package/libssh2/libssh2.mk +1 -1
-LIBSSH2_VERSION = 616fd4d1b3e4a55de67c48819fefca83132126b5
+LIBSSH2_VERSION = 8b870ad771cbd9cd29edbb3dbb0878e950f868ab

Looks like this new version has issues:

http://autobuild.buildroot.net/?

Quoted 8 lines

reason=libssh2-8b870ad771cbd9cd29edbb3dbb0878e950f868ab

Quoted 2 lines

Thomas

Hi Thomas,

tried both defconfigs from Sep, 12th, both build without issues. I can not reproduce the problem here (Debian buster), sorry.

I can reproduce, gonna try to fix this.

Best regards

Signature · 10 lines
Giulio Benetti
CTO

MICRONOVA SRL
Sede: Via A. Niedda 3 - 35010 Vigonza (PD)
Tel. 049/8931563 - Fax 049/8931346
Cod.Fiscale - P.IVA 02663420285
Capitale Sociale ? 26.000 i.v.
Iscritta al Reg. Imprese di Padova N. 02663420285
Numero R.E.A. 258642
#5 lore raw

PATCH 1/1 libssh2: fix build failure due to pointer dereferencing ambiguity

When dereferencing from *aes_ctr_cipher, being a pointer itself, ambiguity can occur with compiler and build can fail reporting:
openssl.c:574:20: error: ?*aes_ctr_cipher? is a pointer; did you mean to use ?->??

     *aes_ctr_cipher->nid = type;

Add a patch to sorround every *aes_ctr_cipher-> occurence with paranthesis like this (*aes_ctr_cipher)->

Fixes:
http://autobuild.buildroot.net/results/97c/97c43dd2122f55f3166683aa1b29ce1ca54bcb9c/
http://autobuild.buildroot.net/results/4b7/4b728d275f1399e3cb72d40482076ee54b35852a/

---
 ...ferencing-ambiguity-potentially-caus.patch | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch
package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch new file +50 -0
new file mode 100644
index 0000000000..3d2a3580b2
@@ -0,0 +1,50 @@
+From 28fe5e4de437f8fce6e428b7db9bc8640cda4c61 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Thu, 13 Sep 2018 09:51:35 +0200
+Subject: [PATCH] openssl: fix dereferencing ambiguity potentially causing
+ build failure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When dereferencing from *aes_ctr_cipher, being a pointer itself,
+ambiguity can occur with compiler and build can fail reporting:
+openssl.c:574:20: error: ?*aes_ctr_cipher? is a pointer; did you mean to use ?->??
+     *aes_ctr_cipher->nid = type;
+
+Sorround every *aes_ctr_cipher-> occurence with paranthesis like this
+(*aes_ctr_cipher)->
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ src/openssl.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/openssl.c b/src/openssl.c
+index 678d5de..c26aaec 100644
+--- a/src/openssl.c
++++ b/src/openssl.c
+@@ -571,13 +571,13 @@ make_ctr_evp (size_t keylen, EVP_CIPHER **aes_ctr_cipher, int type)
+         EVP_CIPHER_meth_set_cleanup(*aes_ctr_cipher, aes_ctr_cleanup);
+     }
+ #else
+-    *aes_ctr_cipher->nid = type;
+-    *aes_ctr_cipher->block_size = 16;
+-    *aes_ctr_cipher->key_len = keylen;
+-    *aes_ctr_cipher->iv_len = 16;
+-    *aes_ctr_cipher->init = aes_ctr_init;
+-    *aes_ctr_cipher->do_cipher = aes_ctr_do_cipher;
+-    *aes_ctr_cipher->cleanup = aes_ctr_cleanup;
++    (*aes_ctr_cipher)->nid = type;
++    (*aes_ctr_cipher)->block_size = 16;
++    (*aes_ctr_cipher)->key_len = keylen;
++    (*aes_ctr_cipher)->iv_len = 16;
++    (*aes_ctr_cipher)->init = aes_ctr_init;
++    (*aes_ctr_cipher)->do_cipher = aes_ctr_do_cipher;
++    (*aes_ctr_cipher)->cleanup = aes_ctr_cleanup;
+ #endif
+ 
+     return *aes_ctr_cipher;
+-- 
+2.17.1
+
Signature · 1 line
2.17.1
#6 lore raw

PATCH 1/1 libssh2: fix build failure due to pointer dereferencing ambiguity

Hello,

Quoted 12 lines · Giulio Benetti

When dereferencing from *aes_ctr_cipher, being a pointer itself, ambiguity can occur with compiler and build can fail reporting:
openssl.c:574:20: error: ?*aes_ctr_cipher? is a pointer; did you mean to use ?->??

     *aes_ctr_cipher->nid = type;

Add a patch to sorround every *aes_ctr_cipher-> occurence with paranthesis like this (*aes_ctr_cipher)->

Fixes:
http://autobuild.buildroot.net/results/97c/97c43dd2122f55f3166683aa1b29ce1ca54bcb9c/
http://autobuild.buildroot.net/results/4b7/4b728d275f1399e3cb72d40482076ee54b35852a/

Quoted 5 lines
---
 ...ferencing-ambiguity-potentially-caus.patch | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com