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

[James Almer]

On 08/08/15 2:00 PM, Nicolas George wrote:
> Le primidi 21 thermidor, an CCXXIII, James Almer a écrit :
>> 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.
> 
> That is strange: I just re-checked, and:
> 
> zsh: exit 1     grep DES_ecb_encrypt /usr/include/tomcrypt*
> 
> It uses a lowercase version. This is Debian's version 1.17-7, and I also
> checked the upstream version.
> 
> There is something I do not understand going on here.
> 
> Regards,

First, sorry for the delay.

I used git head from https://github.com/libtom/libtomcrypt/ and OpenSSL 1.0.2.
The latter apparently has a "des_old.h" header included by des.h with a
"dec_ecb_encrypt" macro, so that's where the clash comes from.
Defining OPENSSL_DISABLE_OLD_DES_SUPPORT before including openssl/des.h seems
to solve this. Will send an updated patch later.