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