aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.org
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2015-12-12 12:29:37 +0100
committerAndy Polyakov <appro@openssl.org>2015-12-13 20:56:50 +0100
commit22c2e80f89327c1287924781a9cfa698dd1b15a6 (patch)
treeda97cc8f12e5d1c7d7e84da2c016e38b16738936 /Makefile.org
parent0c14d442545aaea01067308c39d7c644239adc23 (diff)
downloadopenssl-22c2e80f89327c1287924781a9cfa698dd1b15a6.tar.gz
Configure: add framework for ChaCha and Poly1305 assembly.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Makefile.org')
-rw-r--r--Makefile.org4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.org b/Makefile.org
index cadcaadca0..2eaffde9fc 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -104,6 +104,8 @@ WP_ASM_OBJ=
CMLL_ENC=
MODES_ASM_OBJ=
ENGINES_ASM_OBJ=
+CHACHA_ENC= chacha_enc.o
+POLY1305_ASM_OBJ=
PERLASM_SCHEME=
# Zlib stuff
@@ -235,6 +237,8 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
WP_ASM_OBJ='$(WP_ASM_OBJ)' \
MODES_ASM_OBJ='$(MODES_ASM_OBJ)' \
ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)' \
+ CHACHA_ENC='$(CHACHA_ENC)' \
+ POLY1305_ASM_OBJ='$(POLY1305_ASM_OBJ)' \
PERLASM_SCHEME='$(PERLASM_SCHEME)' \
FIPSLIBDIR='${FIPSLIBDIR}' \
FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}" \