[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto/bn/asm PR/51569: And...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bb7b5ebcd55f
branches:  trunk
changeset: 820373:bb7b5ebcd55f
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 08 01:55:49 2017 +0000

description:
PR/51569: Andreas Gustafsson: Check the right bit for pclmulqdq:
Perform a Carry-Less Multiplication of Quadword instruction
(accelerator for GCM)

diffstat:

 crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gf2m.pl |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (15 lines):

diff -r 2ccacac740bc -r bb7b5ebcd55f crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gf2m.pl
--- a/crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gf2m.pl     Sat Jan 07 23:05:35 2017 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gf2m.pl     Sun Jan 08 01:55:49 2017 +0000
@@ -167,8 +167,9 @@
 .type  bn_GF2m_mul_2x2,\@abi-omnipotent
 .align 16
 bn_GF2m_mul_2x2:
-       mov     OPENSSL_ia32cap_P(%rip),%rax
-       bt      \$33,%rax
+       mov     OPENSSL_ia32cap_P+4(%rip),%rax
+       bt      \$1,%rax         # check PCLMULQDQ bit
+
        jnc     .Lvanilla_mul_2x2
 
        movq            $a1,%xmm0