[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  d84df594404ebbd71d21fec5526178d935e4d88d (commit)
      from  1843787173da9b07029d0863e236107b1dd4fdd7 (commit)


- Log -----------------------------------------------------------------
commit d84df594404ebbd71d21fec5526178d935e4d88d
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Jul 24 23:50:47 2017 +0200

    crypto/x86_64cpuid.pl: fix typo in Knights Landing detection.
    
    Thanks to David Benjamin for spotting this!
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4009)

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

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 a9f93bb..da6d4a2 100644
--- a/crypto/x86_64cpuid.pl
+++ b/crypto/x86_64cpuid.pl
@@ -150,7 +150,7 @@ OPENSSL_ia32_cpuid:
 .LnotP4:
 	cmp	\$6,%ah
 	jne	.Lnotintel
-	and	\$0x0ffff0f0,%eax
+	and	\$0x0fff0ff0,%eax
 	cmp	\$0x00050670,%eax	# Knights Landing
 	je	.Lknights
 	cmp	\$0x00080650,%eax	# Knights Mill (according to sde)