From e896898deac171c94de6466948686fbc280663b2 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Tue, 9 May 2017 11:06:16 +0900 Subject: [PATCH] deps: update openssl asm and asm_obsolete files Regenerate asm files according to the fix of openssl/crypto/perlasm/x86_64-xlate.pl. Fixes: https://github.com/nodejs/node/issues/12691 PR-URL: https://github.com/nodejs/node/pull/12913 Reviewed-By: James M Snell Reviewed-By: Sam Roberts Reviewed-By: Anna Henningsen --- .../x64-win32-masm/aes/aesni-sha256-x86_64.asm | 6 +++--- .../x64-win32-masm/ec/ecp_nistz256-x86_64.asm | 16 ++++++++-------- .../asm/x64-win32-masm/sha/sha256-x86_64.asm | 6 +++--- .../x64-win32-masm/ec/ecp_nistz256-x86_64.asm | 8 ++++---- .../x64-win32-masm/sha/sha256-x86_64.asm | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm b/deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm index 602ee5b2655442..4fe9772a0f5e26 100644 --- a/deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm +++ b/deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm @@ -4150,7 +4150,7 @@ $L$prologue_shaext:: lea rcx,QWORD PTR[112+rcx] pshufd xmm0,xmm1,01bh - pshufd xmm1,xmm1,1h + pshufd xmm1,xmm1,0b1h pshufd xmm2,xmm2,01bh movdqa xmm7,xmm3 DB 102,15,58,15,202,8 @@ -4475,9 +4475,9 @@ $L$aesenclast4:: lea rdi,QWORD PTR[64+rdi] jnz $L$oop_shaext - pshufd xmm2,xmm2,1h + pshufd xmm2,xmm2,0b1h pshufd xmm3,xmm1,01bh - pshufd xmm1,xmm1,1h + pshufd xmm1,xmm1,0b1h punpckhqdq xmm1,xmm2 DB 102,15,58,15,211,8 diff --git a/deps/openssl/asm/x64-win32-masm/ec/ecp_nistz256-x86_64.asm b/deps/openssl/asm/x64-win32-masm/ec/ecp_nistz256-x86_64.asm index 7cf9277bfb33d4..87338aa6f0edae 100644 --- a/deps/openssl/asm/x64-win32-masm/ec/ecp_nistz256-x86_64.asm +++ b/deps/openssl/asm/x64-win32-masm/ec/ecp_nistz256-x86_64.asm @@ -2051,7 +2051,7 @@ $L$SEH_begin_ecp_nistz256_point_add:: por xmm5,xmm4 movdqu xmm0,XMMWORD PTR[rsi] - pshufd xmm3,xmm5,1h + pshufd xmm3,xmm5,0b1h movdqu xmm1,XMMWORD PTR[16+rsi] movdqu xmm2,XMMWORD PTR[32+rsi] por xmm5,xmm3 @@ -2081,7 +2081,7 @@ DB 102,72,15,110,199 call __ecp_nistz256_sqr_montq pcmpeqd xmm5,xmm4 - pshufd xmm4,xmm1,1h + pshufd xmm4,xmm1,0b1h por xmm4,xmm1 pshufd xmm5,xmm5,0 pshufd xmm3,xmm4,01eh @@ -2466,7 +2466,7 @@ $L$SEH_begin_ecp_nistz256_point_add_affine:: por xmm5,xmm4 movdqu xmm0,XMMWORD PTR[rbx] - pshufd xmm3,xmm5,1h + pshufd xmm3,xmm5,0b1h movdqu xmm1,XMMWORD PTR[16+rbx] movdqu xmm2,XMMWORD PTR[32+rbx] por xmm5,xmm3 @@ -2488,7 +2488,7 @@ DB 102,72,15,110,199 call __ecp_nistz256_sqr_montq pcmpeqd xmm5,xmm4 - pshufd xmm4,xmm3,1h + pshufd xmm4,xmm3,0b1h mov rax,QWORD PTR[rbx] mov r9,r12 @@ -3117,7 +3117,7 @@ $L$point_addx:: por xmm5,xmm4 movdqu xmm0,XMMWORD PTR[rsi] - pshufd xmm3,xmm5,1h + pshufd xmm3,xmm5,0b1h movdqu xmm1,XMMWORD PTR[16+rsi] movdqu xmm2,XMMWORD PTR[32+rsi] por xmm5,xmm3 @@ -3147,7 +3147,7 @@ DB 102,72,15,110,199 call __ecp_nistz256_sqr_montx pcmpeqd xmm5,xmm4 - pshufd xmm4,xmm1,1h + pshufd xmm4,xmm1,0b1h por xmm4,xmm1 pshufd xmm5,xmm5,0 pshufd xmm3,xmm4,01eh @@ -3528,7 +3528,7 @@ $L$point_add_affinex:: por xmm5,xmm4 movdqu xmm0,XMMWORD PTR[rbx] - pshufd xmm3,xmm5,1h + pshufd xmm3,xmm5,0b1h movdqu xmm1,XMMWORD PTR[16+rbx] movdqu xmm2,XMMWORD PTR[32+rbx] por xmm5,xmm3 @@ -3550,7 +3550,7 @@ DB 102,72,15,110,199 call __ecp_nistz256_sqr_montx pcmpeqd xmm5,xmm4 - pshufd xmm4,xmm3,1h + pshufd xmm4,xmm3,0b1h mov rdx,QWORD PTR[rbx] mov r9,r12 diff --git a/deps/openssl/asm/x64-win32-masm/sha/sha256-x86_64.asm b/deps/openssl/asm/x64-win32-masm/sha/sha256-x86_64.asm index ddcaa2c5ec5270..d0892736b713ca 100644 --- a/deps/openssl/asm/x64-win32-masm/sha/sha256-x86_64.asm +++ b/deps/openssl/asm/x64-win32-masm/sha/sha256-x86_64.asm @@ -1796,7 +1796,7 @@ $L$prologue_shaext:: movdqa xmm7,XMMWORD PTR[((512-128))+rcx] pshufd xmm0,xmm1,01bh - pshufd xmm1,xmm1,1h + pshufd xmm1,xmm1,0b1h pshufd xmm2,xmm2,01bh movdqa xmm8,xmm7 DB 102,15,58,15,202,8 @@ -1983,9 +1983,9 @@ DB 15,56,203,202 paddd xmm1,xmm9 jnz $L$oop_shaext - pshufd xmm2,xmm2,1h + pshufd xmm2,xmm2,0b1h pshufd xmm7,xmm1,01bh - pshufd xmm1,xmm1,1h + pshufd xmm1,xmm1,0b1h punpckhqdq xmm1,xmm2 DB 102,15,58,15,215,8 diff --git a/deps/openssl/asm_obsolete/x64-win32-masm/ec/ecp_nistz256-x86_64.asm b/deps/openssl/asm_obsolete/x64-win32-masm/ec/ecp_nistz256-x86_64.asm index c985159a7b4012..4086b66e461889 100644 --- a/deps/openssl/asm_obsolete/x64-win32-masm/ec/ecp_nistz256-x86_64.asm +++ b/deps/openssl/asm_obsolete/x64-win32-masm/ec/ecp_nistz256-x86_64.asm @@ -1537,7 +1537,7 @@ $L$SEH_begin_ecp_nistz256_point_add:: por xmm5,xmm4 movdqu xmm0,XMMWORD PTR[rsi] - pshufd xmm3,xmm5,1h + pshufd xmm3,xmm5,0b1h movdqu xmm1,XMMWORD PTR[16+rsi] movdqu xmm2,XMMWORD PTR[32+rsi] por xmm5,xmm3 @@ -1567,7 +1567,7 @@ DB 102,72,15,110,199 call __ecp_nistz256_sqr_montq pcmpeqd xmm5,xmm4 - pshufd xmm4,xmm1,1h + pshufd xmm4,xmm1,0b1h por xmm4,xmm1 pshufd xmm5,xmm5,0 pshufd xmm3,xmm4,01eh @@ -1948,7 +1948,7 @@ $L$SEH_begin_ecp_nistz256_point_add_affine:: por xmm5,xmm4 movdqu xmm0,XMMWORD PTR[rbx] - pshufd xmm3,xmm5,1h + pshufd xmm3,xmm5,0b1h movdqu xmm1,XMMWORD PTR[16+rbx] movdqu xmm2,XMMWORD PTR[32+rbx] por xmm5,xmm3 @@ -1970,7 +1970,7 @@ DB 102,72,15,110,199 call __ecp_nistz256_sqr_montq pcmpeqd xmm5,xmm4 - pshufd xmm4,xmm3,1h + pshufd xmm4,xmm3,0b1h mov rax,QWORD PTR[rbx] mov r9,r12 diff --git a/deps/openssl/asm_obsolete/x64-win32-masm/sha/sha256-x86_64.asm b/deps/openssl/asm_obsolete/x64-win32-masm/sha/sha256-x86_64.asm index 3b1559934f6c27..69a382b8924550 100644 --- a/deps/openssl/asm_obsolete/x64-win32-masm/sha/sha256-x86_64.asm +++ b/deps/openssl/asm_obsolete/x64-win32-masm/sha/sha256-x86_64.asm @@ -1788,7 +1788,7 @@ $L$prologue_shaext:: movdqa xmm7,XMMWORD PTR[((512-128))+rcx] pshufd xmm0,xmm1,01bh - pshufd xmm1,xmm1,1h + pshufd xmm1,xmm1,0b1h pshufd xmm2,xmm2,01bh movdqa xmm8,xmm7 DB 102,15,58,15,202,8 @@ -1975,9 +1975,9 @@ DB 15,56,203,202 paddd xmm1,xmm9 jnz $L$oop_shaext - pshufd xmm2,xmm2,1h + pshufd xmm2,xmm2,0b1h pshufd xmm7,xmm1,01bh - pshufd xmm1,xmm1,1h + pshufd xmm1,xmm1,0b1h punpckhqdq xmm1,xmm2 DB 102,15,58,15,215,8