From: Andy Polyakov <appro@openssl.org>
Date: Sun, 31 Jan 2016 22:05:17 +0000 (+0100)
Subject: Configurations: engage s390x ChaCha20 and Poly1305 modules.
X-Git-Tag: OpenSSL_1_1_0-pre3~162
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6407ef7c490e42c31dc2b6e86daf1b51e2d747de;p=oweals%2Fopenssl.git

Configurations: engage s390x ChaCha20 and Poly1305 modules.

Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index ea4d37e355..527ed742e1 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -125,6 +125,8 @@
 	sha1_asm_src    => "sha1-s390x.s sha256-s390x.s sha512-s390x.s",
 	rc4_asm_src     => "rc4-s390x.s",
 	modes_asm_src   => "ghash-s390x.s",
+	chacha_asm_src  => "chacha-s390x.o",
+	poly1305_asm_src=> "poly1305-s390x.o",
     },
     armv4_asm => {
 	template	=> 1,