[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  6762a14779e262d181fd9e076919253201eec09e (commit)
      from  622a531c18187e3c59a7ab2d32ab990b397aafc2 (commit)


- Log -----------------------------------------------------------------
commit 6762a14779e262d181fd9e076919253201eec09e
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Feb 13 17:44:45 2016 +0100

    Configurations/00-base-templates.conf: typos in [chacha|poly1305]_asm_src.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/00-base-templates.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 468fa64..2d7839b 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -105,7 +105,7 @@
 	sha1_asm_src    => "sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S",
 	cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.s",
 	modes_asm_src   => "ghash-sparcv9.s",
-	poly1305_obj	=> "poly1305-sparcv9.S",
+	poly1305_asm_src=> "poly1305-sparcv9.S",
 	perlasm_scheme	=> "void"
     },
     sparcv8_asm => {
@@ -139,11 +139,11 @@
 	cpuid_asm_src   => "s390xcap.c s390xcpuid.s",
 	bn_asm_src      => "asm/s390x.S s390x-mont.S s390x-gf2m.s",
 	aes_asm_src     => "aes-s390x.S aes-ctr.fake aes-xts.fake",
-	sha1_asm_src    => "sha1-s390x.s sha256-s390x.s sha512-s390x.s",
+	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",
+	modes_asm_src   => "ghash-s390x.S",
+	chacha_asm_src  => "chacha-s390x.S",
+	poly1305_asm_src=> "poly1305-s390x.S",
     },
     armv4_asm => {
 	template	=> 1,