[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  99c002b305705a3d1e092402bc092de1943fbc27 (commit)
       via  b0161f6a8961b131c4dd43a4cc240b4a9ffda72d (commit)
      from  78ee64c237a8d73b8e92b2612f565db26c169ed5 (commit)


- Log -----------------------------------------------------------------
commit 99c002b305705a3d1e092402bc092de1943fbc27
Author: Patrick Steuer <psteuer at mail.de>
Date:   Mon Oct 17 10:30:33 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: Matt Caswell <matt at openssl.org>
    CLA: trivial

commit b0161f6a8961b131c4dd43a4cc240b4a9ffda72d
Author: Patrick Steuer <psteuer at mail.de>
Date:   Mon Oct 17 10:24:49 2016 +0200

    Fix strict-warnings build
    
    crypto/s390xcap.c: 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: Matt Caswell <matt at openssl.org>
    CLA: trivial

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

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

diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl
index 76ca8e5..a8f4d29 100644
--- a/crypto/aes/asm/aes-s390x.pl
+++ b/crypto/aes/asm/aes-s390x.pl
@@ -1568,8 +1568,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]);
 #
 {
@@ -1937,8 +1937,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/evp/e_aes.c b/crypto/evp/e_aes.c
index 1734a82..7c62d32 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -155,10 +155,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 47d6b6f..cf8c372 100644
--- a/crypto/s390xcap.c
+++ b/crypto/s390xcap.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <setjmp.h>
 #include <signal.h>
+#include "cryptlib.h"
 
 extern unsigned long OPENSSL_s390xcap_P[];