[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c0dba2cca4d2bf3526d90a2050bdb17148ce803f (commit)
       via  96cce8205001b5801b10abf53e0ee81ee52d5d89 (commit)
       via  34657a8da2ead453460d668771984432cc767044 (commit)
      from  cde6145ba19a2fce039cf054a89e49f67c623c59 (commit)


- Log -----------------------------------------------------------------
commit c0dba2cca4d2bf3526d90a2050bdb17148ce803f
Author: Patrick Steuer <psteuer at mail.de>
Date:   Sat Oct 15 17:41:41 2016 +0200

    Fix strict-warnings build
    
    crypto/s390xcap.c: internal/cryptlib.h needs to be included for
    OPENSSL_cpuid_setup function prototype is located there to avoid
    build error due to -Werror=missing-prototypes.
    
    Signed-off-by: Patrick Steuer <psteuer at mail.de>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    CLA: trivial

commit 96cce8205001b5801b10abf53e0ee81ee52d5d89
Author: Patrick Steuer <psteuer at mail.de>
Date:   Sat Oct 15 17:14:05 2016 +0200

    Fix strict-warnings build
    
    crypto/evp/e_aes.c: Types of inp and out parameters of
    AES_xts_en/decrypt functions need to be changed from char to
    unsigned char to avoid build error due to
    '-Werror=incompatible-pointer-types'.
    
    crypto/aes/asm/aes-s390x.pl: Comments need to reflect the above
    change.
    
    Signed-off-by: Patrick Steuer <psteuer at mail.de>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    CLA: trivial

commit 34657a8da2ead453460d668771984432cc767044
Author: Patrick Steuer <psteuer at mail.de>
Date:   Sat Oct 15 16:54:52 2016 +0200

    Fix strict-warnings build
    
    crypto/asn1/a_strex.c: Type of width variable in asn1_valid_host
    function  needs to be changed from char to signed char to avoid
    build error due to '-Werror=type-limits'.
    
    Signed-off-by: Patrick Steuer <psteuer at mail.de>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    CLA: trivial

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

Summary of changes:
 crypto/aes/asm/aes-s390x.pl | 8 ++++----
 crypto/asn1/a_strex.c       | 2 +-
 crypto/evp/e_aes.c          | 4 ++--
 crypto/s390xcap.c           | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl
index 9c17f0e..af9d23d 100644
--- a/crypto/aes/asm/aes-s390x.pl
+++ b/crypto/aes/asm/aes-s390x.pl
@@ -1575,8 +1575,8 @@ ___
 }
 
 ########################################################################
-# void AES_xts_encrypt(const char *inp,char *out,size_t len,
-#	const AES_KEY *key1, const AES_KEY *key2,
+# void AES_xts_encrypt(const unsigned char *inp, unsigned char *out,
+#	size_t len, const AES_KEY *key1, const AES_KEY *key2,
 #	const unsigned char iv[16]);
 #
 {
@@ -1944,8 +1944,8 @@ $code.=<<___;
 	br	$ra
 .size	AES_xts_encrypt,.-AES_xts_encrypt
 ___
-# void AES_xts_decrypt(const char *inp,char *out,size_t len,
-#	const AES_KEY *key1, const AES_KEY *key2,
+# void AES_xts_decrypt(const unsigned char *inp, unsigned char *out,
+#	size_t len, const AES_KEY *key1, const AES_KEY *key2,
 #	const unsigned char iv[16]);
 #
 $code.=<<___;
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
index 9839f5c..1bc0679 100644
--- a/crypto/asn1/a_strex.c
+++ b/crypto/asn1/a_strex.c
@@ -601,7 +601,7 @@ int asn1_valid_host(const ASN1_STRING *host)
     const unsigned char *hostptr = host->data;
     int type = host->type;
     int i;
-    char width = -1;
+    signed char width = -1;
     unsigned short chflags = 0, prevchflags;
 
     if (type > 0 && type < 31)
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index f504c68..5810798 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -135,10 +135,10 @@ void AES_ctr32_encrypt(const unsigned char *in, unsigned char *out,
                        const unsigned char ivec[AES_BLOCK_SIZE]);
 #endif
 #ifdef AES_XTS_ASM
-void AES_xts_encrypt(const char *inp, char *out, size_t len,
+void AES_xts_encrypt(const unsigned char *inp, unsigned char *out, size_t len,
                      const AES_KEY *key1, const AES_KEY *key2,
                      const unsigned char iv[16]);
-void AES_xts_decrypt(const char *inp, char *out, size_t len,
+void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len,
                      const AES_KEY *key1, const AES_KEY *key2,
                      const unsigned char iv[16]);
 #endif
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c
index 675f2ec..93c5327 100644
--- a/crypto/s390xcap.c
+++ b/crypto/s390xcap.c
@@ -12,6 +12,7 @@
 #include <string.h>
 #include <setjmp.h>
 #include <signal.h>
+#include "internal/cryptlib.h"
 
 extern unsigned long OPENSSL_s390xcap_P[];