Instead of a local hack, implement SIZE_MAX in numbers.h if it's missing

Reviewed-by: Stephen Henson <steve@openssl.org>

diff --git a/include/internal/numbers.h b/include/internal/numbers.h
index 1f79ef797281301e8ffab63ddbd349ca05364c06..da06dab7a6f68dea837f4f17539c196d184d40e7 100644 (file)
--- a/include/internal/numbers.h
+++ b/include/internal/numbers.h
@@ -105,5 +105,9 @@
 #  define UINT64_MAX __MAXUINT__(uint64_t)
 # endif
 
 #  define UINT64_MAX __MAXUINT__(uint64_t)
 # endif
 

+# ifndef SIZE_MAX
+#  define SIZE_MAX __MAXUINT__(size_t)
+# endif
+

 #endif
 
 #endif
 

diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index 48a5f3d7dc9c7cbd796b9b419bb0b66d07e29224..ed7c1ca1293b7d8369cb5cd52d73614cf4f27f3b 100644 (file)
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -65,6 +65,8 @@
 # include <openssl/crypto.h>
 # include <openssl/e_os2.h>
 
 # include <openssl/crypto.h>
 # include <openssl/e_os2.h>
 

+# include "internal/numbers.h"
+

 # ifdef __cplusplus
 extern "C" {
 # endif
 # ifdef __cplusplus
 extern "C" {
 # endif


@@ -111,13 +113,8 @@ __owur static ossl_inline int PACKET_buf_init(PACKET *pkt, unsigned char *buf,
                                               size_t len)
 {
     /* Sanity check for negative values. */
                                               size_t len)
 {
     /* Sanity check for negative values. */

-#ifdef SIZE_MAX

     if (len > (size_t)(SIZE_MAX / 2))
         return 0;
     if (len > (size_t)(SIZE_MAX / 2))
         return 0;

-#else
-    if (len > ((size_t)2 << (sizeof(size_t) * 8 - 1)))
-        return 0;
-#endif

 
     pkt->curr = buf;
     pkt->remaining = len;
 
     pkt->curr = buf;
     pkt->remaining = len;