From 09d116da87a1a6d360edb4e54af96f5b7544e68f Mon Sep 17 00:00:00 2001 From: Karel Miko Date: Mon, 29 Oct 2018 11:28:07 +0100 Subject: [PATCH] avoid using LOAD32H/STORE32H with unsigned long --- src/misc/ssh/ssh_decode_sequence_multi.c | 5 +++-- src/misc/ssh/ssh_encode_sequence_multi.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/misc/ssh/ssh_decode_sequence_multi.c b/src/misc/ssh/ssh_decode_sequence_multi.c index f01a03199..5828cfbd5 100644 --- a/src/misc/ssh/ssh_decode_sequence_multi.c +++ b/src/misc/ssh/ssh_decode_sequence_multi.c @@ -33,7 +33,8 @@ int ssh_decode_sequence_multi(const unsigned char *in, unsigned long inlen, ...) char *sdata; ulong32 *u32data; ulong64 *u64data; - unsigned long size, bufsize; + unsigned long bufsize; + ulong32 size; LTC_ARGCHK(in != NULL); @@ -53,7 +54,7 @@ int ssh_decode_sequence_multi(const unsigned char *in, unsigned long inlen, ...) } /* Calculate (or read) length of data */ - size = (unsigned long)-1; + size = 0xFFFFFFFFU; switch (type) { case LTC_SSHDATA_BYTE: case LTC_SSHDATA_BOOLEAN: diff --git a/src/misc/ssh/ssh_encode_sequence_multi.c b/src/misc/ssh/ssh_encode_sequence_multi.c index 0fe237850..96facd5dd 100644 --- a/src/misc/ssh/ssh_encode_sequence_multi.c +++ b/src/misc/ssh/ssh_encode_sequence_multi.c @@ -27,7 +27,7 @@ int ssh_encode_sequence_multi(unsigned char *out, unsigned long *outlen, ...) { int err; va_list args; - unsigned long size; + ulong32 size; ssh_data_type type; void *vdata; const char *sdata;