diff options
author | Patrick Steuer <psteuer@mail.de> | 2016-10-15 17:14:05 +0200 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-10-18 17:09:47 +0100 |
commit | 96cce8205001b5801b10abf53e0ee81ee52d5d89 (patch) | |
tree | 015e8a6815eefff8d6e5c4184915342a61abcbea /crypto | |
parent | 34657a8da2ead453460d668771984432cc767044 (diff) |
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@mail.de>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
CLA: trivial
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/aes/asm/aes-s390x.pl | 8 | ||||
-rw-r--r-- | crypto/evp/e_aes.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl index 9c17f0e5c2..af9d23dcf9 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/evp/e_aes.c b/crypto/evp/e_aes.c index f504c68886..5810798ab3 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 |