[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d67e755418b62fb451ec221c126c9935a06ea63b (commit)
      from  1d7f3350f8d6651296d5ef9c124439e9b56cf37b (commit)


- Log -----------------------------------------------------------------
commit d67e755418b62fb451ec221c126c9935a06ea63b
Author: David Benjamin <davidben at google.com>
Date:   Wed Jul 26 12:30:27 2017 -0400

    Fix comment typo.
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4023)

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

Summary of changes:
 crypto/x86_64cpuid.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
index da6d4a2..f228c24 100644
--- a/crypto/x86_64cpuid.pl
+++ b/crypto/x86_64cpuid.pl
@@ -207,7 +207,7 @@ OPENSSL_ia32_cpuid:
 	mov	\$0xefffe7ff,%eax	# ~(1<<28|1<<12|1<<11)
 	and	%eax,%r9d		# clear AVX, FMA and AMD XOP bits
 	mov	\$0x3fdeffdf,%eax	# ~(1<<31|1<<30|1<<21|1<<16|1<<5)
-	and	%eax,8(%rdi)		# cleax AVX2 and AVX512* bits
+	and	%eax,8(%rdi)		# clear AVX2 and AVX512* bits
 .Ldone:
 	shl	\$32,%r9
 	mov	%r10d,%eax