diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/tls/tls_channel.cpp | 2 | ||||
| -rw-r--r-- | src/lib/utils/compiler.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/tls/tls_channel.cpp b/src/lib/tls/tls_channel.cpp index 9bff836f2..ced5dd3f1 100644 --- a/src/lib/tls/tls_channel.cpp +++ b/src/lib/tls/tls_channel.cpp @@ -447,7 +447,7 @@ void Channel::process_handshake_ccs(const secure_vector<uint8_t>& record, record_sequence); } } - else if(record_sequence == 0) + else { create_handshake_state(record_version); } diff --git a/src/lib/utils/compiler.h b/src/lib/utils/compiler.h index abb2a79f0..8629435d9 100644 --- a/src/lib/utils/compiler.h +++ b/src/lib/utils/compiler.h @@ -83,7 +83,10 @@ /* * Define BOTAN_MALLOC_FN */ -#if defined(__clang__) || (BOTAN_GCC_VERSION >= 500) +#if defined(__ibmxl__) + // XLC pretends to be both Clang and GCC, but is neither + #define BOTAN_MALLOC_FN __attribute__ ((malloc)) +#elif defined(__clang__) || (BOTAN_GCC_VERSION >= 500) #define BOTAN_MALLOC_FN __attribute__ ((malloc, returns_nonnull, alloc_size(1,2))) #elif defined(__GNUG__) #define BOTAN_MALLOC_FN __attribute__ ((malloc, alloc_size(1,2))) |