From: Andy Polyakov <appro@openssl.org>
Date: Tue, 9 Feb 2016 22:08:30 +0000 (+0100)
Subject: Configurations: engage x86[_64] ChaCha20 and Poly1305 modules.
X-Git-Tag: OpenSSL_1_1_0-pre3~148
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5d1f03f29e2794f6d1642dfedf10fc3e334937d0;p=oweals%2Fopenssl.git

Configurations: engage x86[_64] ChaCha20 and Poly1305 modules.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 527ed742e1..3cc078f8e6 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -46,6 +46,8 @@
 	cmll_asm_src	=> "cmll-x86.s",
 	modes_asm_src	=> "ghash-x86.s",
 	padlock_asm_src	=> "e_padlock-x86.s",
+	chacha_asm_src	=> "chacha-x86.s",
+	poly1305_asm_src=> "poly1305-x86.s",
     },
     x86_elf_asm => {
 	template	=> 1,
@@ -65,6 +67,8 @@
 	cmll_asm_src    => "cmll-x86_64.s cmll_misc.c",
 	modes_asm_src   => "ghash-x86_64.s aesni-gcm-x86_64.s",
 	padlock_asm_src => "e_padlock-x86_64.s",
+	chacha_asm_src	=> "chacha-x86_64.s",
+	poly1305_asm_src=> "poly1305-x86_64.s",
     },
     ia64_asm => {
 	template	=> 1,