[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen stable-4.13] crypto: adjust rijndaelEncrypt() prototype for gcc11



commit b127def25683a0d42c9c640bfda901fd2b3d5e0a
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Mar 18 15:05:33 2021 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Mar 18 15:05:33 2021 +0100

    crypto: adjust rijndaelEncrypt() prototype for gcc11
    
    The upcoming release complains, not entirely unreasonably:
    
    In file included from rijndael.c:33:
    .../xen/include/crypto/rijndael.h:55:53: note: previously declared as 
'const unsigned char[]'
       55 | void    rijndaelEncrypt(const unsigned int [], int, const unsigned 
char [],
          |                                                     
^~~~~~~~~~~~~~~~~~~~~~
    rijndael.c:865:8: error: argument 4 of type 'u8[16]' {aka 'unsigned 
char[16]'} with mismatched bound [-Werror=array-parameter=]
      865 |     u8 ct[16])
          |     ~~~^~~~~~
    In file included from rijndael.c:33:
    .../xen/include/crypto/rijndael.h:56:13: note: previously declared as 
'unsigned char[]'
       56 |             unsigned char []);
          |             ^~~~~~~~~~~~~~~~
    
    Simply declare the correct array dimensions right away. This then allows
    compilers to apply checking at call sites, which seems desirable anyway.
    
    For the moment I'm leaving untouched the disagreement between u8/u32
    used in the function definition and unsigned {char,int} used in the
    declaration, as making this consistent would call for touching further
    functions.
    
    Reported-by: Charles Arnold <carnold@xxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Julien Grall <jgrall@xxxxxxxxxx>
    master commit: c6ad5a701b9a6df443a6c98d9e7201c958bbcafc
    master date: 2021-03-04 16:47:51 +0100
---
 xen/include/crypto/rijndael.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/include/crypto/rijndael.h b/xen/include/crypto/rijndael.h
index 69965783c5..4386be5878 100644
--- a/xen/include/crypto/rijndael.h
+++ b/xen/include/crypto/rijndael.h
@@ -52,7 +52,7 @@ void   rijndael_encrypt(rijndael_ctx *, const unsigned char 
*, unsigned char *);
 
 int    rijndaelKeySetupEnc(unsigned int [], const unsigned char [], int);
 int    rijndaelKeySetupDec(unsigned int [], const unsigned char [], int);
-void   rijndaelEncrypt(const unsigned int [], int, const unsigned char [],
-           unsigned char []);
+void   rijndaelEncrypt(const unsigned int [], int, const unsigned char [16],
+           unsigned char [16]);
 
 #endif /* __RIJNDAEL_H */
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.13



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.