diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-08-30 19:22:51 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-09-22 00:07:44 +0200 |
| commit | 11d8abb33161decd55b7f5fcadb88a03cf9aebb0 (patch) | |
| tree | 98998c5d55026ba7c6aa1fd457f87244526c68eb /Makefile.org | |
| parent | 320d9497815ba4e3a1dc9e2e4cdc59ff37e7dda3 (diff) | |
Configure: add configuration for crypto/ec/asm extensions.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 6019cdd327526beb25a4c31c1ef63e72f5f8a4b0)
Resolved conflicts:
Configure
Makefile.org
TABLE
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index 90fec54708..b7a3f96c9f 100644 --- a/Makefile.org +++ b/Makefile.org @@ -88,6 +88,7 @@ PROCESSOR= # CPUID module collects small commonly used assembler snippets CPUID_OBJ= BN_ASM= bn_asm.o +EC_ASM= DES_ENC= des_enc.o fcrypt_b.o AES_ENC= aes_core.o aes_cbc.o BF_ENC= bf_enc.o @@ -221,8 +222,8 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \ EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \ SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \ PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)' \ - CPUID_OBJ='$(CPUID_OBJ)' \ - BN_ASM='$(BN_ASM)' DES_ENC='$(DES_ENC)' \ + CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)' \ + EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)' \ AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)' \ BF_ENC='$(BF_ENC)' CAST_ENC='$(CAST_ENC)' \ RC4_ENC='$(RC4_ENC)' RC5_ENC='$(RC5_ENC)' \ |