[FFmpeg-devel] [PATCH 4/5] crypto_bench: add support for des

[James Almer]

On 08/08/15 5:56 AM, Nicolas George wrote:
> Le quintidi 15 thermidor, an CCXXIII, James Almer a écrit :
>> OpenSSL and Tomcrypt des modules are not benched together as there's
>> some naming collisions between the two.
>>
>> Signed-off-by: James Almer <jamrial at gmail.com>
>> ---
>>  tools/crypto_bench.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 58 insertions(+)
> 
> LGTM for the code.
> 
> Regarding the ifdefry, can you be more precise about the nature of the
> conflicts? I suspect it could be made slightly more efficient. But that
> should not prevent you from pushing now if you prefer.

Both tomcrypt and openssl named their function DES_ecb_encrypt(), and it
fails to compile if you include OpenSSL's des header while also compiling
with tomcrypt.

I couldn't find a way to get around this aside from making them exclusive.

> Regards,