From 027dcbfb5516672fd09ca09a3cc2c9182ac1528a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 12 Aug 2019 11:27:16 +0200 Subject: [PATCH] engines/build.info: if the padlock engine is disabled, don't build it! Fixes #9244 Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/9572) --- engines/build.info | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/engines/build.info b/engines/build.info index df173ea69d..1db771971c 100644 --- a/engines/build.info +++ b/engines/build.info @@ -2,8 +2,9 @@ IF[{- !$disabled{"engine"} -}] IF[{- $disabled{"dynamic-engine"} -}] LIBS=../libcrypto - SOURCE[../libcrypto]=\ - e_padlock.c {- $target{padlock_asm_src} -} + IF[{- !$disabled{hw} && !$disabled{'hw-padlock'} -}] + SOURCE[../libcrypto]= e_padlock.c {- $target{padlock_asm_src} -} + ENDIF IF[{- !$disabled{capieng} -}] SOURCE[../libcrypto]=e_capi.c ENDIF @@ -11,10 +12,12 @@ IF[{- !$disabled{"engine"} -}] SOURCE[../libcrypto]=e_afalg.c ENDIF ELSE - ENGINES=padlock - SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -} - DEPEND[padlock]=../libcrypto - INCLUDE[padlock]=../include + IF[{- !$disabled{hw} && !$disabled{'hw-padlock'} -}] + ENGINES=padlock + SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -} + DEPEND[padlock]=../libcrypto + INCLUDE[padlock]=../include + ENDIF IF[{- !$disabled{capieng} -}] ENGINES=capi SOURCE[capi]=e_capi.c -- 2.25.1