From fae7a5310ad560f6afa3ab94ed349510443caf56 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 27 Jul 2015 23:28:01 +0100 Subject: [PATCH] [build] Fix strict-aliasing warning on older gcc versions Reported-by: James A. Peltier Reported-by: Matthew Helton Signed-off-by: Michael Brown --- src/crypto/aes.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/crypto/aes.c b/src/crypto/aes.c index 1605d2ee..b9e206bf 100644 --- a/src/crypto/aes.c +++ b/src/crypto/aes.c @@ -156,13 +156,17 @@ static struct aes_table aes_invmixcolumns; */ static inline __attribute__ (( always_inline )) uint32_t aes_entry_column ( const union aes_table_entry *entry, unsigned int column ) { - const uint8_t *first __attribute__ (( may_alias )); + const union { + uint8_t byte; + uint32_t column; + } __attribute__ (( may_alias )) *product; - /* Locate start of relevant four-byte subset */ - first = &entry->byte[ 4 - column ]; + /* Locate relevant four-byte subset */ + product = container_of ( &entry->byte[ 4 - column ], + typeof ( *product ), byte ); /* Extract this four-byte subset */ - return ( *( ( uint32_t * ) first ) ); + return product->column; } /**