[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  660e7588ed5305554215f3c1174a2a8e0b3b9485 (commit)
       via  a0130dedc79cc67a2cee91a47b7d660b1c10c6f4 (commit)
       via  6b99e875d823033227696c9d03968f8e4a3e28ef (commit)
      from  2ea92604969fb9e5e53e135393e04ebc512f808b (commit)


- Log -----------------------------------------------------------------
commit 660e7588ed5305554215f3c1174a2a8e0b3b9485
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 9 08:38:11 2016 +0100

    err_lcl.h is gone, don't pretend it's there
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

commit a0130dedc79cc67a2cee91a47b7d660b1c10c6f4
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 9 08:32:20 2016 +0100

    Add missing semi
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

commit 6b99e875d823033227696c9d03968f8e4a3e28ef
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 9 08:18:54 2016 +0100

    Counter mixed signedness with a cast
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 Configurations/descrip.mms.tmpl | 2 +-
 crypto/err/Makefile.in          | 2 +-
 ssl/ssl_lib.c                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 7334f69..84213cc 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -453,7 +453,7 @@ EOF
       my $before = $unified_info{before}->{$obj.".OBJ"} || "\@ !";
       my $after = $unified_info{after}->{$obj.".OBJ"} || "\@ !";
       my $depbuild = $disabled{makedepend} ? ""
-          : " /MMS=(FILE=${objd}${objn}.tmp-MMS,TARGET=$obj.OBJ)"
+          : " /MMS=(FILE=${objd}${objn}.tmp-MMS,TARGET=$obj.OBJ)";
 
       return <<"EOF";
 $obj.OBJ : $deps
diff --git a/crypto/err/Makefile.in b/crypto/err/Makefile.in
index 9329e91..f0051e8 100644
--- a/crypto/err/Makefile.in
+++ b/crypto/err/Makefile.in
@@ -20,7 +20,7 @@ LIBOBJ=err.o err_all.o err_prn.o
 
 SRC= $(LIBSRC)
 
-HEADER=	err_lcl.h
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 75e8125..f6bf42d 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1717,7 +1717,7 @@ long SSL_ctrl(SSL *s, int cmd, long larg, void *parg)
             s->split_send_fragment = s->max_send_fragment;
         return 1;
     case SSL_CTRL_SET_SPLIT_SEND_FRAGMENT:
-        if (larg > s->max_send_fragment || larg == 0)
+        if ((unsigned int)larg > s->max_send_fragment || larg == 0)
             return 0;
         s->split_send_fragment = larg;
         return 1;
@@ -1871,7 +1871,7 @@ long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
             ctx->split_send_fragment = ctx->split_send_fragment;
         return 1;
     case SSL_CTRL_SET_SPLIT_SEND_FRAGMENT:
-        if (larg > ctx->max_send_fragment || larg == 0)
+        if ((unsigned int)larg > ctx->max_send_fragment || larg == 0)
             return 0;
         ctx->split_send_fragment = larg;
         return 1;