mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-31 13:20:03 +00:00
libssh: Fix build with clang16
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+46
@@ -0,0 +1,46 @@
|
|||||||
|
From 0cade4573334571055127a2d4fe3641e2397948d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
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 <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
@@ -8,6 +8,7 @@ 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://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 \
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85"
|
SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85"
|
||||||
|
|||||||
Reference in New Issue
Block a user