diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-05-20 03:27:58 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-05-20 03:45:28 +0200 |
| commit | 1514f7cea3428e453d900e36a0b6d0c2778c0296 (patch) | |
| tree | 2b887017b31802596321344cdd4e61863acfa4e7 /engines | |
| parent | remove duplicate tests (diff) | |
| download | openssl-1514f7cea3428e453d900e36a0b6d0c2778c0296.tar.xz openssl-1514f7cea3428e453d900e36a0b6d0c2778c0296.zip | |
Move engines/afalg to engines
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3491)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/afalg/build.info | 13 | ||||
| -rw-r--r-- | engines/build.info | 10 | ||||
| -rw-r--r-- | engines/e_afalg.c (renamed from engines/afalg/e_afalg.c) | 0 | ||||
| -rw-r--r-- | engines/e_afalg.ec (renamed from engines/afalg/e_afalg.ec) | 0 | ||||
| -rw-r--r-- | engines/e_afalg.h (renamed from engines/afalg/e_afalg.h) | 0 | ||||
| -rw-r--r-- | engines/e_afalg_err.c (renamed from engines/afalg/e_afalg_err.c) | 0 | ||||
| -rw-r--r-- | engines/e_afalg_err.h (renamed from engines/afalg/e_afalg_err.h) | 0 |
7 files changed, 10 insertions, 13 deletions
diff --git a/engines/afalg/build.info b/engines/afalg/build.info deleted file mode 100644 index 8601b1afca..0000000000 --- a/engines/afalg/build.info +++ /dev/null @@ -1,13 +0,0 @@ -IF[{- !$disabled{"engine"} -}] - IF[{- !$disabled{afalg} -}] - IF[{- $disabled{"dynamic-engine"} -}] - LIBS=../../libcrypto - SOURCE[../../libcrypto]=e_afalg.c e_afalg_err.c - ELSE - ENGINES=afalg - SOURCE[afalg]=e_afalg.c e_afalg_err.c - DEPEND[afalg]=../../libcrypto - INCLUDE[afalg]= ../../include - ENDIF - ENDIF -ENDIF diff --git a/engines/build.info b/engines/build.info index 1c47e77099..2f0c54a0bc 100644 --- a/engines/build.info +++ b/engines/build.info @@ -1,4 +1,5 @@ IF[{- !$disabled{"engine"} -}] + IF[{- $disabled{"dynamic-engine"} -}] LIBS=../libcrypto SOURCE[../libcrypto]=\ @@ -6,6 +7,9 @@ IF[{- !$disabled{"engine"} -}] IF[{- !$disabled{capieng} -}] SOURCE[../libcrypto]=e_capi.c ENDIF + IF[{- !$disabled{afalgeng} -}] + SOURCE[../libcrypto]=e_afalg.c e_afalg_err.c + ENDIF ELSE ENGINES=padlock SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -} @@ -17,6 +21,12 @@ IF[{- !$disabled{"engine"} -}] DEPEND[capi]=../libcrypto INCLUDE[capi]=../include ENDIF + IF[{- !$disabled{afalgeng} -}] + ENGINES=afalg + SOURCE[afalg]=e_afalg.c e_afalg_err.c + DEPEND[afalg]=../libcrypto + INCLUDE[afalg]= ../include + ENDIF ENGINES_NO_INST=ossltest dasync SOURCE[dasync]=e_dasync.c diff --git a/engines/afalg/e_afalg.c b/engines/e_afalg.c index 5ce9047105..5ce9047105 100644 --- a/engines/afalg/e_afalg.c +++ b/engines/e_afalg.c diff --git a/engines/afalg/e_afalg.ec b/engines/e_afalg.ec index 2d14d6597d..2d14d6597d 100644 --- a/engines/afalg/e_afalg.ec +++ b/engines/e_afalg.ec diff --git a/engines/afalg/e_afalg.h b/engines/e_afalg.h index 948d67e584..948d67e584 100644 --- a/engines/afalg/e_afalg.h +++ b/engines/e_afalg.h diff --git a/engines/afalg/e_afalg_err.c b/engines/e_afalg_err.c index ca394edb7b..ca394edb7b 100644 --- a/engines/afalg/e_afalg_err.c +++ b/engines/e_afalg_err.c diff --git a/engines/afalg/e_afalg_err.h b/engines/e_afalg_err.h index 21abc979c6..21abc979c6 100644 --- a/engines/afalg/e_afalg_err.h +++ b/engines/e_afalg_err.h |