Commit 96cce820 authored by Patrick Steuer's avatar Patrick Steuer Committed by Matt Caswell
Browse files

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: default avatarPatrick Steuer <psteuer@mail.de>

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
CLA: trivial
parent 34657a8d

crypto/aes/asm/aes-s390x.pl

+4 −4
Original line number Diff line number Diff line
@@ -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.=<<___;

crypto/evp/e_aes.c

+2 −2
Original line number Diff line number Diff line
@@ -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