package/libssh: fix build with gcc 4.8
PATCH 1/1 package/libssh: fix build with gcc 4.8
Fixes:
- http://autobuild.buildroot.org/results/a56c515746874549714270c9a635f8a2ef303e67
--- ...pt-fix-strict-overflow-error-with-gcc-4.8.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch
package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch new file +34 -0
@@ -0,0 +1,34 @@ +From aaebb96688cfcb9dc32fcfbb80a499cf2de25536 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sun, 17 Feb 2019 12:20:45 +0100 +Subject: [PATCH] pki_gcrypt: fix strict-overflow error with gcc 4.8 + +/home/buildroot/autobuild/instance-1/output/build/libssh-0.8.6/src/pki_gcrypt.c: In function 'privatekey_string_to_buffer': +/home/buildroot/autobuild/instance-1/output/build/libssh-0.8.6/src/pki_gcrypt.c:485:10: error: assuming signed overflow does not occur when simplifying conditional to constant [-Werror=strict-overflow] + while(len > 0 && strncmp(p, header_end, header_end_size) != 0) { + ^ +Fixes: + - http://autobuild.buildroot.org/results/a56c515746874549714270c9a635f8a2ef303e67 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://bugs.libssh.org/T132] +--- + src/pki_gcrypt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c +index c0cf5926..e7b26fe6 100644 +--- a/src/pki_gcrypt.c ++++ b/src/pki_gcrypt.c +@@ -409,7 +409,7 @@ static ssh_buffer privatekey_string_to_buffer(const char *pkey, int type, + unsigned int iv_len = 0; + int algo = 0; + int mode = 0; +- int len; ++ size_t len; + + buffer = ssh_buffer_new(); + if (buffer == NULL) { +-- +2.14.1 +
Signature · 1 line
2.14.1
PATCH 1/1 package/libssh: fix build with gcc 4.8
Hi Fabrice,
Quoted 33 lines · Fabrice Fontaine
Fixes:
- http://autobuild.buildroot.org/results/a56c515746874549714270c9a635f8a2ef303e67Signed-off-by Fabrice Fontaine <[email protected]>--- ...pt-fix-strict-overflow-error-with-gcc-4.8.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patchpackage/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch new file +18
-0@@ -0,0 +1,34 @@ +From aaebb96688cfcb9dc32fcfbb80a499cf2de25536 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sun, 17 Feb 2019 12:20:45 +0100 +Subject: [PATCH] pki_gcrypt: fix strict-overflow error with gcc 4.8 + +/home/buildroot/autobuild/instance-1/output/build/libssh-0.8.6/src/pki_gcrypt.c: In function 'privatekey_string_to_buffer': +/home/buildroot/autobuild/instance-1/output/build/libssh-0.8.6/src/pki_gcrypt.c:485:10: error: assuming signed overflow does not occur when simplifying conditional to constant [-Werror=strict-overflow] + while(len > 0 && strncmp(p, header_end, header_end_size) != 0) { + ^ +Fixes: + - http://autobuild.buildroot.org/results/a56c515746874549714270c9a635f8a2ef303e67 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://bugs.libssh.org/T132] +--- + src/pki_gcrypt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +
package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch line 28
Quoted 10 lines
package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch new file +10
-0+diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c +index c0cf5926..e7b26fe6 100644 +--- a/src/pki_gcrypt.c ++++ b/src/pki_gcrypt.c +@@ -409,7 +409,7 @@ static ssh_buffer privatekey_string_to_buffer(const char *pkey, int type, + unsigned int iv_len = 0; + int algo = 0; + int mode = 0; +- int len; ++ size_t len;
I don't think you can do that. size_t is unsigned. len is passed to the get_next_line() macro that does this:
if(p[len] == '\0') /* EOL */ \
len = -1;Callers of get_next_line() rely on this behavior.
package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch line 31
Quoted 3 lines
package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch new file +3
-0+ + buffer = ssh_buffer_new(); + if (buffer == NULL) {
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
PATCH 1/1 package/libssh: fix build with gcc 4.8
Dear Baruch,
Le dim. 17 f?vr. 2019 ? 20:26, Baruch Siach <[email protected]> a ?crit :
Quoted 51 lines
Hi Fabrice,
Quoted 33 lines · Fabrice Fontaine
Fixes:
- http://autobuild.buildroot.org/results/a56c515746874549714270c9a635f8a2ef303e67Signed-off-by Fabrice Fontaine <[email protected]>--- ...pt-fix-strict-overflow-error-with-gcc-4.8.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patchpackage/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch new file +18
-0@@ -0,0 +1,34 @@ +From aaebb96688cfcb9dc32fcfbb80a499cf2de25536 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sun, 17 Feb 2019 12:20:45 +0100 +Subject: [PATCH] pki_gcrypt: fix strict-overflow error with gcc 4.8 + +/home/buildroot/autobuild/instance-1/output/build/libssh-0.8.6/src/pki_gcrypt.c: In function 'privatekey_string_to_buffer': +/home/buildroot/autobuild/instance-1/output/build/libssh-0.8.6/src/pki_gcrypt.c:485:10: error: assuming signed overflow does not occur when simplifying conditional to constant [-Werror=strict-overflow] + while(len > 0 && strncmp(p, header_end, header_end_size) != 0) { + ^ +Fixes: + - http://autobuild.buildroot.org/results/a56c515746874549714270c9a635f8a2ef303e67 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://bugs.libssh.org/T132] +--- + src/pki_gcrypt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch line 28
Quoted 10 lines
package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch new file +10
-0+diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c +index c0cf5926..e7b26fe6 100644 +--- a/src/pki_gcrypt.c ++++ b/src/pki_gcrypt.c +@@ -409,7 +409,7 @@ static ssh_buffer privatekey_string_to_buffer(const char *pkey, int type, + unsigned int iv_len = 0; + int algo = 0; + int mode = 0; +- int len; ++ size_t len;I don't think you can do that.
size_tis unsigned. len is passed to theget_next_line()macro that does this:
Quoted 4 lines
if(p[len] == '\0') /* EOL */ \ len = -1;Callers of
get_next_line()rely on this behavior.
Indeed, you're right, I was too quick on this one :-/. I'll send a new patch to disable -Werror.
Quoted 11 lines
package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch line 31
Quoted 4 lines
package/libssh/0005-pki_gcrypt-fix-strict-overflow-error-with-gcc-4.8.patch new file +3
-0+ + buffer = ssh_buffer_new(); + if (buffer == NULL) {baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Best Regards,
Fabrice