Merge pull request #648 from dorianj/fixsslnocomp

libfreerdp-crypto: only use SSL_OP_NO_COMPRESSION if it's defined.
This commit is contained in:
Marc-André Moreau 2012-07-04 08:24:19 -07:00
commit 3a964ff14a
2 changed files with 7 additions and 3 deletions

View File

@ -65,7 +65,7 @@ FREERDP_API void stream_extend(STREAM* stream, int request_size);
#define stream_read_uint8(_s, _v) do { _v = *_s->p++; } while (0)
#define stream_read_uint16(_s, _v) do { _v = \
(uint16)(*_s->p) + \
(((uint16)(*(_s->p + 1))) << 8); \
(uint16)(((uint16)(*(_s->p + 1))) << 8); \
_s->p += 2; } while (0)
#define stream_read_uint32(_s, _v) do { _v = \
(uint32)(*_s->p) + \

View File

@ -76,8 +76,10 @@ boolean tls_connect(rdpTls* tls)
* and the FreeRDP client, and caused major performance issues,
* which is why we're disabling it.
*/
#ifdef SSL_OP_NO_COMPRESSION
options |= SSL_OP_NO_COMPRESSION;
#endif
/**
* SSL_OP_TLS_BLOCK_PADDING_BUG:
*
@ -179,8 +181,10 @@ boolean tls_accept(rdpTls* tls, const char* cert_file, const char* privatekey_fi
* and the FreeRDP client, and caused major performance issues,
* which is why we're disabling it.
*/
#ifdef SSL_OP_NO_COMPRESSION
options |= SSL_OP_NO_COMPRESSION;
#endif
/**
* SSL_OP_TLS_BLOCK_PADDING_BUG:
*