lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-21 14:00:51 +03:00
Code Activity

transport: rename local RANDOM_PADDING macro

Browse Source 
Rename `RANDOM_PADDING` macro used internally to enable some code.

Committed in the initial version of `transport.c` in
9d55db6501 (2007-02-02). libssh2 code
never defined it.

The name happens to collide with a Windows macro in `wincrypt.h`.
`transport.c` doesn't include this header, but it includes `winsock2.h`,
and it turns out it can also define this macro in some cases, e.g.
when `WIN32_LEAN_AND_MEAN` is not set.

To be on the safe side, prefix the name with `LIBSSH2_` to avoid
enabling it by accident.

Q: Maybe it'd be best to delete it with the guarded code?

Reported-by: Markus-Schmidt on github
Fixes #921
Closes #924
This commit is contained in:
Viktor Szakats
2023-04-03 12:07:49 +00:00
parent 194cfc0f84
commit d1b36efe41
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/transport.c
View File

@@ -723,7 +723,7 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session,
ssize_t padding_length; ssize_t padding_length;
size_t packet_length; size_t packet_length;
ssize_t total_length; ssize_t total_length;
#ifdef RANDOM_PADDING #ifdef LIBSSH2_RANDOM_PADDING
int rand_max; int rand_max;
int seed = data[0]; /* FIXME: make this random */ int seed = data[0]; /* FIXME: make this random */
#endif #endif
@@ -846,7 +846,7 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session,
if(padding_length < 4) { if(padding_length < 4) {
padding_length += blocksize; padding_length += blocksize;
} }
#ifdef RANDOM_PADDING #ifdef LIBSSH2_RANDOM_PADDING
/* FIXME: we can add padding here, but that also makes the packets /* FIXME: we can add padding here, but that also makes the packets
bigger etc */ bigger etc */