Skip to content

Commit aacb550

Browse files
implausibleMaximiliano Korp
implausible
authored and
Maximiliano Korp
committed
Bump openssl to 1.0.2h (same as node 6.3.1)
1 parent 4f0fed0 commit aacb550

384 files changed

Lines changed: 15480 additions & 7101 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎vendor/openssl/asm/x64-elf-gas/aes/aes-x86_64.s‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ _x86_64_AES_encrypt:
8181
movl 0(%r14,%rdi,8),%edi
8282
movl 0(%r14,%rbp,8),%ebp
8383

84-
andl $65280,%edi
85-
andl $65280,%ebp
84+
andl $0x0000ff00,%edi
85+
andl $0x0000ff00,%ebp
8686

8787
xorl %edi,%r10d
8888
xorl %ebp,%r11d
@@ -94,8 +94,8 @@ _x86_64_AES_encrypt:
9494
movl 0(%r14,%rsi,8),%esi
9595
movl 0(%r14,%rdi,8),%edi
9696

97-
andl $65280,%esi
98-
andl $65280,%edi
97+
andl $0x0000ff00,%esi
98+
andl $0x0000ff00,%edi
9999
shrl $16,%ebx
100100
xorl %esi,%r12d
101101
xorl %edi,%r8d
@@ -108,9 +108,9 @@ _x86_64_AES_encrypt:
108108
movl 0(%r14,%rdi,8),%edi
109109
movl 0(%r14,%rbp,8),%ebp
110110

111-
andl $16711680,%esi
112-
andl $16711680,%edi
113-
andl $16711680,%ebp
111+
andl $0x00ff0000,%esi
112+
andl $0x00ff0000,%edi
113+
andl $0x00ff0000,%ebp
114114

115115
xorl %esi,%r10d
116116
xorl %edi,%r11d
@@ -123,9 +123,9 @@ _x86_64_AES_encrypt:
123123
movl 2(%r14,%rdi,8),%edi
124124
movl 2(%r14,%rbp,8),%ebp
125125

126-
andl $16711680,%esi
127-
andl $4278190080,%edi
128-
andl $4278190080,%ebp
126+
andl $0x00ff0000,%esi
127+
andl $0xff000000,%edi
128+
andl $0xff000000,%ebp
129129

130130
xorl %esi,%r8d
131131
xorl %edi,%r10d
@@ -138,8 +138,8 @@ _x86_64_AES_encrypt:
138138
movl 2(%r14,%rdi,8),%edi
139139
movl 16+0(%r15),%eax
140140

141-
andl $4278190080,%esi
142-
andl $4278190080,%edi
141+
andl $0xff000000,%esi
142+
andl $0xff000000,%edi
143143

144144
xorl %esi,%r12d
145145
xorl %edi,%r8d
@@ -241,8 +241,8 @@ _x86_64_AES_encrypt_compact:
241241
xorl %r8d,%edx
242242
cmpq 16(%rsp),%r15
243243
je .Lenc_compact_done
244-
movl $2155905152,%r10d
245-
movl $2155905152,%r11d
244+
movl $0x80808080,%r10d
245+
movl $0x80808080,%r11d
246246
andl %eax,%r10d
247247
andl %ebx,%r11d
248248
movl %r10d,%esi
@@ -253,20 +253,20 @@ _x86_64_AES_encrypt_compact:
253253
leal (%rbx,%rbx,1),%r9d
254254
subl %r10d,%esi
255255
subl %r11d,%edi
256-
andl $4278124286,%r8d
257-
andl $4278124286,%r9d
258-
andl $454761243,%esi
259-
andl $454761243,%edi
256+
andl $0xfefefefe,%r8d
257+
andl $0xfefefefe,%r9d
258+
andl $0x1b1b1b1b,%esi
259+
andl $0x1b1b1b1b,%edi
260260
movl %eax,%r10d
261261
movl %ebx,%r11d
262262
xorl %esi,%r8d
263263
xorl %edi,%r9d
264264

265265
xorl %r8d,%eax
266266
xorl %r9d,%ebx
267-
movl $2155905152,%r12d
267+
movl $0x80808080,%r12d
268268
roll $24,%eax
269-
movl $2155905152,%ebp
269+
movl $0x80808080,%ebp
270270
roll $24,%ebx
271271
andl %ecx,%r12d
272272
andl %edx,%ebp
@@ -289,10 +289,10 @@ _x86_64_AES_encrypt_compact:
289289
xorl %r10d,%eax
290290
xorl %r11d,%ebx
291291

292-
andl $4278124286,%r8d
293-
andl $4278124286,%r9d
294-
andl $454761243,%esi
295-
andl $454761243,%edi
292+
andl $0xfefefefe,%r8d
293+
andl $0xfefefefe,%r9d
294+
andl $0x1b1b1b1b,%esi
295+
andl $0x1b1b1b1b,%edi
296296
movl %ecx,%r12d
297297
movl %edx,%ebp
298298
xorl %esi,%r8d
@@ -345,7 +345,7 @@ AES_encrypt:
345345
andq $-64,%rsp
346346
subq %rsp,%rcx
347347
negq %rcx
348-
andq $960,%rcx
348+
andq $0x3c0,%rcx
349349
subq %rcx,%rsp
350350
subq $32,%rsp
351351

@@ -370,7 +370,7 @@ AES_encrypt:
370370
leaq .LAES_Te+2048(%rip),%r14
371371
leaq 768(%rsp),%rbp
372372
subq %r14,%rbp
373-
andq $768,%rbp
373+
andq $0x300,%rbp
374374
leaq (%r14,%rbp,1),%r14
375375

376376
call _x86_64_AES_encrypt_compact
@@ -792,7 +792,7 @@ AES_decrypt:
792792
andq $-64,%rsp
793793
subq %rsp,%rcx
794794
negq %rcx
795-
andq $960,%rcx
795+
andq $0x3c0,%rcx
796796
subq %rcx,%rsp
797797
subq $32,%rsp
798798

@@ -817,7 +817,7 @@ AES_decrypt:
817817
leaq .LAES_Td+2048(%rip),%r14
818818
leaq 768(%rsp),%rbp
819819
subq %r14,%rbp
820-
andq $768,%rbp
820+
andq $0x300,%rbp
821821
leaq (%r14,%rbp,1),%r14
822822
shrq $3,%rbp
823823
addq %rbp,%r14
@@ -1333,9 +1333,9 @@ AES_cbc_encrypt:
13331333
movq %r14,%r10
13341334
leaq 2304(%r14),%r11
13351335
movq %r15,%r12
1336-
andq $4095,%r10
1337-
andq $4095,%r11
1338-
andq $4095,%r12
1336+
andq $0xFFF,%r10
1337+
andq $0xFFF,%r11
1338+
andq $0xFFF,%r12
13391339

13401340
cmpq %r11,%r12
13411341
jb .Lcbc_te_break_out
@@ -1344,7 +1344,7 @@ AES_cbc_encrypt:
13441344
jmp .Lcbc_te_ok
13451345
.Lcbc_te_break_out:
13461346
subq %r10,%r12
1347-
andq $4095,%r12
1347+
andq $0xFFF,%r12
13481348
addq $320,%r12
13491349
subq %r12,%r15
13501350
.align 4
@@ -1370,7 +1370,7 @@ AES_cbc_encrypt:
13701370

13711371
movq %r15,%r10
13721372
subq %r14,%r10
1373-
andq $4095,%r10
1373+
andq $0xfff,%r10
13741374
cmpq $2304,%r10
13751375
jb .Lcbc_do_ecopy
13761376
cmpq $4096-248,%r10
@@ -1557,7 +1557,7 @@ AES_cbc_encrypt:
15571557
leaq -88-63(%rcx),%r10
15581558
subq %rbp,%r10
15591559
negq %r10
1560-
andq $960,%r10
1560+
andq $0x3c0,%r10
15611561
subq %r10,%rbp
15621562

15631563
xchgq %rsp,%rbp
@@ -1586,7 +1586,7 @@ AES_cbc_encrypt:
15861586
leaq 2048(%r14),%r14
15871587
leaq 768-8(%rsp),%rax
15881588
subq %r14,%rax
1589-
andq $768,%rax
1589+
andq $0x300,%rax
15901590
leaq (%r14,%rax,1),%r14
15911591

15921592
cmpq $0,%rbx

‎vendor/openssl/asm/x64-elf-gas/aes/aesni-mb-x86_64.s‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ _avx_cbc_dec_shortcut:
11201120
vpxor %xmm15,%xmm8,%xmm8
11211121
vmovdqu %xmm9,112(%rbp)
11221122
vpxor %xmm15,%xmm9,%xmm9
1123-
xorq $128,%rbp
1123+
xorq $0x80,%rbp
11241124
movl $1,%ecx
11251125
jmp .Loop_dec8x
11261126

‎vendor/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4015,9 +4015,9 @@ aesni_cbc_sha256_enc_shaext:
40154015
movups 16(%rcx),%xmm4
40164016
leaq 112(%rcx),%rcx
40174017

4018-
pshufd $27,%xmm1,%xmm0
4019-
pshufd $177,%xmm1,%xmm1
4020-
pshufd $27,%xmm2,%xmm2
4018+
pshufd $0x1b,%xmm1,%xmm0
4019+
pshufd $0xb1,%xmm1,%xmm1
4020+
pshufd $0x1b,%xmm2,%xmm2
40214021
movdqa %xmm3,%xmm7
40224022
.byte 102,15,58,15,202,8
40234023
punpcklqdq %xmm0,%xmm2
@@ -4043,7 +4043,7 @@ aesni_cbc_sha256_enc_shaext:
40434043
movups -80(%rcx),%xmm5
40444044
aesenc %xmm4,%xmm6
40454045
.byte 15,56,203,209
4046-
pshufd $14,%xmm0,%xmm0
4046+
pshufd $0x0e,%xmm0,%xmm0
40474047
movups -64(%rcx),%xmm4
40484048
aesenc %xmm5,%xmm6
40494049
.byte 15,56,203,202
@@ -4055,7 +4055,7 @@ aesni_cbc_sha256_enc_shaext:
40554055
movups -48(%rcx),%xmm5
40564056
aesenc %xmm4,%xmm6
40574057
.byte 15,56,203,209
4058-
pshufd $14,%xmm0,%xmm0
4058+
pshufd $0x0e,%xmm0,%xmm0
40594059
movups -32(%rcx),%xmm4
40604060
aesenc %xmm5,%xmm6
40614061
.byte 15,56,203,202
@@ -4067,7 +4067,7 @@ aesni_cbc_sha256_enc_shaext:
40674067
movups -16(%rcx),%xmm5
40684068
aesenc %xmm4,%xmm6
40694069
.byte 15,56,203,209
4070-
pshufd $14,%xmm0,%xmm0
4070+
pshufd $0x0e,%xmm0,%xmm0
40714071
movdqa %xmm13,%xmm3
40724072
.byte 102,65,15,58,15,220,4
40734073
paddd %xmm3,%xmm10
@@ -4082,7 +4082,7 @@ aesni_cbc_sha256_enc_shaext:
40824082
movups 16(%rcx),%xmm5
40834083
aesenc %xmm4,%xmm6
40844084
.byte 15,56,203,209
4085-
pshufd $14,%xmm0,%xmm0
4085+
pshufd $0x0e,%xmm0,%xmm0
40864086
movups 32(%rcx),%xmm4
40874087
aesenc %xmm5,%xmm6
40884088
movdqa %xmm10,%xmm3
@@ -4096,7 +4096,7 @@ aesni_cbc_sha256_enc_shaext:
40964096
movups 48(%rcx),%xmm5
40974097
aesenc %xmm4,%xmm6
40984098
.byte 15,56,203,209
4099-
pshufd $14,%xmm0,%xmm0
4099+
pshufd $0x0e,%xmm0,%xmm0
41004100
movdqa %xmm11,%xmm3
41014101
.byte 102,65,15,58,15,218,4
41024102
paddd %xmm3,%xmm12
@@ -4129,7 +4129,7 @@ aesni_cbc_sha256_enc_shaext:
41294129
movups -64(%rcx),%xmm4
41304130
aesenc %xmm5,%xmm6
41314131
.byte 15,56,203,209
4132-
pshufd $14,%xmm0,%xmm0
4132+
pshufd $0x0e,%xmm0,%xmm0
41334133
movdqa %xmm12,%xmm3
41344134
.byte 102,65,15,58,15,219,4
41354135
paddd %xmm3,%xmm13
@@ -4143,7 +4143,7 @@ aesni_cbc_sha256_enc_shaext:
41434143
movups -32(%rcx),%xmm4
41444144
aesenc %xmm5,%xmm6
41454145
.byte 15,56,203,209
4146-
pshufd $14,%xmm0,%xmm0
4146+
pshufd $0x0e,%xmm0,%xmm0
41474147
movdqa %xmm13,%xmm3
41484148
.byte 102,65,15,58,15,220,4
41494149
paddd %xmm3,%xmm10
@@ -4157,7 +4157,7 @@ aesni_cbc_sha256_enc_shaext:
41574157
movups 0(%rcx),%xmm4
41584158
aesenc %xmm5,%xmm6
41594159
.byte 15,56,203,209
4160-
pshufd $14,%xmm0,%xmm0
4160+
pshufd $0x0e,%xmm0,%xmm0
41614161
movdqa %xmm10,%xmm3
41624162
.byte 102,65,15,58,15,221,4
41634163
paddd %xmm3,%xmm11
@@ -4171,7 +4171,7 @@ aesni_cbc_sha256_enc_shaext:
41714171
movups 32(%rcx),%xmm4
41724172
aesenc %xmm5,%xmm6
41734173
.byte 15,56,203,209
4174-
pshufd $14,%xmm0,%xmm0
4174+
pshufd $0x0e,%xmm0,%xmm0
41754175
movdqa %xmm11,%xmm3
41764176
.byte 102,65,15,58,15,218,4
41774177
paddd %xmm3,%xmm12
@@ -4206,7 +4206,7 @@ aesni_cbc_sha256_enc_shaext:
42064206
movups -64(%rcx),%xmm4
42074207
aesenc %xmm5,%xmm6
42084208
.byte 15,56,203,209
4209-
pshufd $14,%xmm0,%xmm0
4209+
pshufd $0x0e,%xmm0,%xmm0
42104210
movdqa %xmm12,%xmm3
42114211
.byte 102,65,15,58,15,219,4
42124212
paddd %xmm3,%xmm13
@@ -4220,7 +4220,7 @@ aesni_cbc_sha256_enc_shaext:
42204220
movups -32(%rcx),%xmm4
42214221
aesenc %xmm5,%xmm6
42224222
.byte 15,56,203,209
4223-
pshufd $14,%xmm0,%xmm0
4223+
pshufd $0x0e,%xmm0,%xmm0
42244224
movdqa %xmm13,%xmm3
42254225
.byte 102,65,15,58,15,220,4
42264226
paddd %xmm3,%xmm10
@@ -4234,7 +4234,7 @@ aesni_cbc_sha256_enc_shaext:
42344234
movups 0(%rcx),%xmm4
42354235
aesenc %xmm5,%xmm6
42364236
.byte 15,56,203,209
4237-
pshufd $14,%xmm0,%xmm0
4237+
pshufd $0x0e,%xmm0,%xmm0
42384238
movdqa %xmm10,%xmm3
42394239
.byte 102,65,15,58,15,221,4
42404240
paddd %xmm3,%xmm11
@@ -4248,7 +4248,7 @@ aesni_cbc_sha256_enc_shaext:
42484248
movups 32(%rcx),%xmm4
42494249
aesenc %xmm5,%xmm6
42504250
.byte 15,56,203,209
4251-
pshufd $14,%xmm0,%xmm0
4251+
pshufd $0x0e,%xmm0,%xmm0
42524252
movdqa %xmm11,%xmm3
42534253
.byte 102,65,15,58,15,218,4
42544254
paddd %xmm3,%xmm12
@@ -4275,7 +4275,7 @@ aesni_cbc_sha256_enc_shaext:
42754275
movups 16-112(%rcx),%xmm4
42764276
nop
42774277
.byte 15,56,203,209
4278-
pshufd $14,%xmm0,%xmm0
4278+
pshufd $0x0e,%xmm0,%xmm0
42794279
movdqa %xmm12,%xmm3
42804280
.byte 102,65,15,58,15,219,4
42814281
paddd %xmm3,%xmm13
@@ -4296,7 +4296,7 @@ aesni_cbc_sha256_enc_shaext:
42964296
movups -48(%rcx),%xmm5
42974297
aesenc %xmm4,%xmm6
42984298
.byte 15,56,203,209
4299-
pshufd $14,%xmm0,%xmm0
4299+
pshufd $0x0e,%xmm0,%xmm0
43004300
movups -32(%rcx),%xmm4
43014301
aesenc %xmm5,%xmm6
43024302
.byte 15,56,203,202
@@ -4308,7 +4308,7 @@ aesni_cbc_sha256_enc_shaext:
43084308
movups 0(%rcx),%xmm4
43094309
aesenc %xmm5,%xmm6
43104310
.byte 15,56,203,209
4311-
pshufd $14,%xmm0,%xmm0
4311+
pshufd $0x0e,%xmm0,%xmm0
43124312
movups 16(%rcx),%xmm5
43134313
aesenc %xmm4,%xmm6
43144314
.byte 15,56,203,202
@@ -4341,9 +4341,9 @@ aesni_cbc_sha256_enc_shaext:
43414341
leaq 64(%rdi),%rdi
43424342
jnz .Loop_shaext
43434343

4344-
pshufd $177,%xmm2,%xmm2
4345-
pshufd $27,%xmm1,%xmm3
4346-
pshufd $177,%xmm1,%xmm1
4344+
pshufd $0xb1,%xmm2,%xmm2
4345+
pshufd $0x1b,%xmm1,%xmm3
4346+
pshufd $0xb1,%xmm1,%xmm1
43474347
punpckhqdq %xmm2,%xmm1
43484348
.byte 102,15,58,15,211,8
43494349

0 commit comments

Comments
 (0)