Skip to content

Commit d0662a9

Browse files
maxkorpmaxkorp
committed
Update to OpenSSL 1.0.2e from nodejs/node
1 parent f6085e9 commit d0662a9

433 files changed

Lines changed: 2944 additions & 45221 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/README.md‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎vendor/openssl/asm/arm-void-gas/bn/armv4-gf2m.S‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ bn_GF2m_mul_2x2:
9898
mov r12,#7<<2
9999
sub sp,sp,#32 @ allocate tab[8]
100100

101-
bl mul_1x1_ialu @ a1·b1
101+
bl mul_1x1_ialu @ a1·b1
102102
str r5,[r10,#8]
103103
str r4,[r10,#12]
104104

@@ -108,13 +108,13 @@ bn_GF2m_mul_2x2:
108108
eor r2,r2,r1
109109
eor r0,r0,r3
110110
eor r1,r1,r2
111-
bl mul_1x1_ialu @ a0·b0
111+
bl mul_1x1_ialu @ a0·b0
112112
str r5,[r10]
113113
str r4,[r10,#4]
114114

115115
eor r1,r1,r2
116116
eor r0,r0,r3
117-
bl mul_1x1_ialu @ (a1+a0)·(b1+b0)
117+
bl mul_1x1_ialu @ (a1+a0)·(b1+b0)
118118
ldmia r10,{r6-r9}
119119
eor r5,r5,r4
120120
eor r4,r4,r7

‎vendor/openssl/asm/arm-void-gas/modes/ghash-armv4.S‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
.text
44
.code 32
55

6+
#ifdef __clang__
7+
#define ldrplb ldrbpl
8+
#define ldrneb ldrbne
9+
#endif
10+
611
.type rem_4bit,%object
712
.align 5
813
rem_4bit:

‎vendor/openssl/asm/arm-void-gas/modes/ghashv8-armx.S‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ gcm_gmult_v8:
6666
#endif
6767
vext.8 q3,q9,q9,#8
6868

69-
.byte 0x86,0x0e,0xa8,0xf2 @ pmull q0,q12,q3 @ H.lo·Xi.lo
69+
.byte 0x86,0x0e,0xa8,0xf2 @ pmull q0,q12,q3 @ H.lo·Xi.lo
7070
veor q9,q9,q3 @ Karatsuba pre-processing
71-
.byte 0x87,0x4e,0xa9,0xf2 @ pmull2 q2,q12,q3 @ H.hi·Xi.hi
72-
.byte 0xa2,0x2e,0xaa,0xf2 @ pmull q1,q13,q9 @ (H.lo+H.hi)·(Xi.lo+Xi.hi)
71+
.byte 0x87,0x4e,0xa9,0xf2 @ pmull2 q2,q12,q3 @ H.hi·Xi.hi
72+
.byte 0xa2,0x2e,0xaa,0xf2 @ pmull q1,q13,q9 @ (H.lo+H.hi)·(Xi.lo+Xi.hi)
7373

7474
vext.8 q9,q0,q2,#8 @ Karatsuba post-processing
7575
veor q10,q0,q2
@@ -134,7 +134,7 @@ gcm_ghash_v8:
134134
#endif
135135
vext.8 q7,q9,q9,#8
136136
veor q3,q3,q0 @ I[i]^=Xi
137-
.byte 0x8e,0x8e,0xa8,0xf2 @ pmull q4,q12,q7 @ H·Ii+1
137+
.byte 0x8e,0x8e,0xa8,0xf2 @ pmull q4,q12,q7 @ H·Ii+1
138138
veor q9,q9,q7 @ Karatsuba pre-processing
139139
.byte 0x8f,0xce,0xa9,0xf2 @ pmull2 q6,q12,q7
140140
b .Loop_mod2x_v8
@@ -143,14 +143,14 @@ gcm_ghash_v8:
143143
.Loop_mod2x_v8:
144144
vext.8 q10,q3,q3,#8
145145
subs r3,r3,#32 @ is there more data?
146-
.byte 0x86,0x0e,0xac,0xf2 @ pmull q0,q14,q3 @ H^2.lo·Xi.lo
146+
.byte 0x86,0x0e,0xac,0xf2 @ pmull q0,q14,q3 @ H^2.lo·Xi.lo
147147
movlo r12,#0 @ is it time to zero r12?
148148

149149
.byte 0xa2,0xae,0xaa,0xf2 @ pmull q5,q13,q9
150150
veor q10,q10,q3 @ Karatsuba pre-processing
151-
.byte 0x87,0x4e,0xad,0xf2 @ pmull2 q2,q14,q3 @ H^2.hi·Xi.hi
151+
.byte 0x87,0x4e,0xad,0xf2 @ pmull2 q2,q14,q3 @ H^2.hi·Xi.hi
152152
veor q0,q0,q4 @ accumulate
153-
.byte 0xa5,0x2e,0xab,0xf2 @ pmull2 q1,q13,q10 @ (H^2.lo+H^2.hi)·(Xi.lo+Xi.hi)
153+
.byte 0xa5,0x2e,0xab,0xf2 @ pmull2 q1,q13,q10 @ (H^2.lo+H^2.hi)·(Xi.lo+Xi.hi)
154154
vld1.64 {q8},[r2],r12 @ load [rotated] I[i+2]
155155

156156
veor q2,q2,q6
@@ -175,7 +175,7 @@ gcm_ghash_v8:
175175
vext.8 q7,q9,q9,#8
176176
vext.8 q3,q8,q8,#8
177177
veor q0,q1,q10
178-
.byte 0x8e,0x8e,0xa8,0xf2 @ pmull q4,q12,q7 @ H·Ii+1
178+
.byte 0x8e,0x8e,0xa8,0xf2 @ pmull q4,q12,q7 @ H·Ii+1
179179
veor q3,q3,q2 @ accumulate q3 early
180180

181181
vext.8 q10,q0,q0,#8 @ 2nd phase of reduction
@@ -196,10 +196,10 @@ gcm_ghash_v8:
196196
veor q3,q3,q0 @ inp^=Xi
197197
veor q9,q8,q10 @ q9 is rotated inp^Xi
198198

199-
.byte 0x86,0x0e,0xa8,0xf2 @ pmull q0,q12,q3 @ H.lo·Xi.lo
199+
.byte 0x86,0x0e,0xa8,0xf2 @ pmull q0,q12,q3 @ H.lo·Xi.lo
200200
veor q9,q9,q3 @ Karatsuba pre-processing
201-
.byte 0x87,0x4e,0xa9,0xf2 @ pmull2 q2,q12,q3 @ H.hi·Xi.hi
202-
.byte 0xa2,0x2e,0xaa,0xf2 @ pmull q1,q13,q9 @ (H.lo+H.hi)·(Xi.lo+Xi.hi)
201+
.byte 0x87,0x4e,0xa9,0xf2 @ pmull2 q2,q12,q3 @ H.hi·Xi.hi
202+
.byte 0xa2,0x2e,0xaa,0xf2 @ pmull q1,q13,q9 @ (H.lo+H.hi)·(Xi.lo+Xi.hi)
203203

204204
vext.8 q9,q0,q2,#8 @ Karatsuba post-processing
205205
veor q10,q0,q2

‎vendor/openssl/asm/arm64-linux64-gas/modes/ghashv8-armx.S‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ gcm_gmult_v8:
6565
#endif
6666
ext v3.16b,v17.16b,v17.16b,#8
6767

68-
pmull v0.1q,v20.1d,v3.1d //H.loˇXi.lo
68+
pmull v0.1q,v20.1d,v3.1d //H.lo·Xi.lo
6969
eor v17.16b,v17.16b,v3.16b //Karatsuba pre-processing
70-
pmull2 v2.1q,v20.2d,v3.2d //H.hiˇXi.hi
71-
pmull v1.1q,v21.1d,v17.1d //(H.lo+H.hi)ˇ(Xi.lo+Xi.hi)
70+
pmull2 v2.1q,v20.2d,v3.2d //H.hi·Xi.hi
71+
pmull v1.1q,v21.1d,v17.1d //(H.lo+H.hi)·(Xi.lo+Xi.hi)
7272

7373
ext v17.16b,v0.16b,v2.16b,#8 //Karatsuba post-processing
7474
eor v18.16b,v0.16b,v2.16b
@@ -132,7 +132,7 @@ gcm_ghash_v8:
132132
#endif
133133
ext v7.16b,v17.16b,v17.16b,#8
134134
eor v3.16b,v3.16b,v0.16b //I[i]^=Xi
135-
pmull v4.1q,v20.1d,v7.1d //HˇIi+1
135+
pmull v4.1q,v20.1d,v7.1d //H·Ii+1
136136
eor v17.16b,v17.16b,v7.16b //Karatsuba pre-processing
137137
pmull2 v6.1q,v20.2d,v7.2d
138138
b .Loop_mod2x_v8
@@ -141,14 +141,14 @@ gcm_ghash_v8:
141141
.Loop_mod2x_v8:
142142
ext v18.16b,v3.16b,v3.16b,#8
143143
subs x3,x3,#32 //is there more data?
144-
pmull v0.1q,v22.1d,v3.1d //H^2.loˇXi.lo
144+
pmull v0.1q,v22.1d,v3.1d //H^2.lo·Xi.lo
145145
csel x12,xzr,x12,lo //is it time to zero x12?
146146

147147
pmull v5.1q,v21.1d,v17.1d
148148
eor v18.16b,v18.16b,v3.16b //Karatsuba pre-processing
149-
pmull2 v2.1q,v22.2d,v3.2d //H^2.hiˇXi.hi
149+
pmull2 v2.1q,v22.2d,v3.2d //H^2.hi·Xi.hi
150150
eor v0.16b,v0.16b,v4.16b //accumulate
151-
pmull2 v1.1q,v21.2d,v18.2d //(H^2.lo+H^2.hi)ˇ(Xi.lo+Xi.hi)
151+
pmull2 v1.1q,v21.2d,v18.2d //(H^2.lo+H^2.hi)·(Xi.lo+Xi.hi)
152152
ld1 {v16.2d},[x2],x12 //load [rotated] I[i+2]
153153

154154
eor v2.16b,v2.16b,v6.16b
@@ -173,7 +173,7 @@ gcm_ghash_v8:
173173
ext v7.16b,v17.16b,v17.16b,#8
174174
ext v3.16b,v16.16b,v16.16b,#8
175175
eor v0.16b,v1.16b,v18.16b
176-
pmull v4.1q,v20.1d,v7.1d //HˇIi+1
176+
pmull v4.1q,v20.1d,v7.1d //H·Ii+1
177177
eor v3.16b,v3.16b,v2.16b //accumulate v3.16b early
178178

179179
ext v18.16b,v0.16b,v0.16b,#8 //2nd phase of reduction
@@ -194,10 +194,10 @@ gcm_ghash_v8:
194194
eor v3.16b,v3.16b,v0.16b //inp^=Xi
195195
eor v17.16b,v16.16b,v18.16b //v17.16b is rotated inp^Xi
196196

197-
pmull v0.1q,v20.1d,v3.1d //H.loˇXi.lo
197+
pmull v0.1q,v20.1d,v3.1d //H.lo·Xi.lo
198198
eor v17.16b,v17.16b,v3.16b //Karatsuba pre-processing
199-
pmull2 v2.1q,v20.2d,v3.2d //H.hiˇXi.hi
200-
pmull v1.1q,v21.1d,v17.1d //(H.lo+H.hi)ˇ(Xi.lo+Xi.hi)
199+
pmull2 v2.1q,v20.2d,v3.2d //H.hi·Xi.hi
200+
pmull v1.1q,v21.1d,v17.1d //(H.lo+H.hi)·(Xi.lo+Xi.hi)
201201

202202
ext v17.16b,v0.16b,v2.16b,#8 //Karatsuba post-processing
203203
eor v18.16b,v0.16b,v2.16b

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ aesni_cbc_sha256_enc:
2121
andl $296,%r11d
2222
cmpl $296,%r11d
2323
je aesni_cbc_sha256_enc_avx2
24-
andl $1073741824,%eax
25-
andl $268435968,%r10d
26-
orl %eax,%r10d
27-
cmpl $1342177792,%r10d
28-
je aesni_cbc_sha256_enc_avx
24+
andl $268435456,%r10d
25+
jnz aesni_cbc_sha256_enc_avx
2926
ud2
3027
xorl %eax,%eax
3128
cmpq $0,%rdi

0 commit comments

Comments
 (0)