[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e65780782aa41df5023410f64d5bb7a7cb3b2888 (commit)
       via  36830ecac7a5ff1935e465d6e95f32d72e614a56 (commit)
       via  3dc9589cc84735a8478b34a121e648d1cadfb715 (commit)
      from  72245f340c41c7d04b7a2b7a99aec9897e22d9cb (commit)


- Log -----------------------------------------------------------------
commit e65780782aa41df5023410f64d5bb7a7cb3b2888
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Dec 30 14:57:16 2015 +0100

    Correct missing prototype
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit 36830ecac7a5ff1935e465d6e95f32d72e614a56
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Dec 30 14:56:59 2015 +0100

    SIZE_MAX doesn't exist everywhere, supply an alternative
    
    SIZE_MAX is a great macro, and does unfortunately not exist everywhere.
    Since we check against half of it, using bitwise shift to calculate the
    value of half SIZE_MAX should be safe enough.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit 3dc9589cc84735a8478b34a121e648d1cadfb715
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Dec 30 14:54:29 2015 +0100

    Fix some missing or faulty header file inclusions
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/vms_decc_init.c | 2 ++
 crypto/ct/ct_lib.c   | 2 +-
 crypto/dso/dso_vms.c | 2 +-
 ssl/packet_locl.h    | 5 +++++
 ssl/ssl_mcnf.c       | 4 ++--
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/vms_decc_init.c b/apps/vms_decc_init.c
index 2b273ac..b66c00f 100644
--- a/apps/vms_decc_init.c
+++ b/apps/vms_decc_init.c
@@ -68,6 +68,8 @@
 # include <stdlib.h>
 # include <unixlib.h>
 
+# include "apps.h"
+
 /* Global storage. */
 
 /* Flag to sense if decc_init() was called. */
diff --git a/crypto/ct/ct_lib.c b/crypto/ct/ct_lib.c
index eac6035..d1ec85d 100644
--- a/crypto/ct/ct_lib.c
+++ b/crypto/ct/ct_lib.c
@@ -60,7 +60,7 @@
 
 # include <limits.h>
 # include "internal/cryptlib.h"
-# include "../ssl/ssl_locl.h"
+# include "../../ssl/ssl_locl.h"
 # include "internal/ct_int.h"
 
 SCT *SCT_new(void)
diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 700a30b..de3102a 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -76,7 +76,7 @@ DSO_METHOD *DSO_METHOD_vms(void)
 # include <stsdef.h>
 # include <descrip.h>
 # include <starlet.h>
-# include "vms_rms.h"
+# include "../vms_rms.h"
 
 /* Some compiler options may mask the declaration of "_malloc32". */
 # if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h
index 39fac55..48a5f3d 100644
--- a/ssl/packet_locl.h
+++ b/ssl/packet_locl.h
@@ -111,8 +111,13 @@ __owur static ossl_inline int PACKET_buf_init(PACKET *pkt, unsigned char *buf,
                                               size_t len)
 {
     /* Sanity check for negative values. */
+#ifdef SIZE_MAX
     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;
diff --git a/ssl/ssl_mcnf.c b/ssl/ssl_mcnf.c
index a223c73..9a1cbbd 100644
--- a/ssl/ssl_mcnf.c
+++ b/ssl/ssl_mcnf.c
@@ -83,7 +83,7 @@ struct ssl_conf_cmd {
 static struct ssl_conf_name *ssl_names;
 static size_t ssl_names_count;
 
-static void ssl_module_free()
+static void ssl_module_free(CONF_IMODULE *md)
 {
     size_t i, j;
     if (ssl_names == NULL)
@@ -161,7 +161,7 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
     rv = 1;
     err:
     if (rv == 0)
-        ssl_module_free();
+        ssl_module_free(md);
     return rv;
 }