Willy-JL 27d4d8c1d8 Fix merge 2 lat temu
..
aes.c 27d4d8c1d8 Fix merge 2 lat temu
aes.h 27d4d8c1d8 Fix merge 2 lat temu
gcm.c 27d4d8c1d8 Fix merge 2 lat temu
gcm.h 27d4d8c1d8 Fix merge 2 lat temu