Skip to content

Commit 179784e

Browse files
committed
Revert "deps: downgrade openssl to v1.0.0f"
This commit undoes the downgrade from OpenSSL v1.0.1e to v1.0.0f, effectively upgrading OpenSSL to v1.0.1e again. The reason for the downgrade was to work around compatibility issues with certain TLS servers in the stable branch. See the commit log of 4fdb8ac and the linked issue for details. We're going to revisit that in the master branch. This reverts commit 4fdb8ac.
1 parent d3ddee6 commit 179784e

File tree

512 files changed

+42009
-21212
lines changed

Some content is hidden

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

512 files changed

+42009
-21212
lines changed

deps/openssl/README.chromium

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

deps/openssl/asm/Makefile

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ PERL += -I../openssl/crypto/perlasm -I../openssl/crypto/bn/asm
44

55
OUTPUTS = \
66
x86-elf-gas/aes/aes-586.s \
7+
x86-elf-gas/aes/aesni-x86.s \
78
x86-elf-gas/bf/bf-686.s \
89
x86-elf-gas/bn/x86-mont.s \
910
x86-elf-gas/bn/x86.s \
@@ -21,15 +22,20 @@ OUTPUTS = \
2122
x86-elf-gas/whrlpool/wp-mmx.s \
2223
x86-elf-gas/x86cpuid.s \
2324
x64-elf-gas/aes/aes-x86_64.s \
25+
x64-elf-gas/aes/aesni-x86_64.s \
26+
x64-elf-gas/aes/aesni-sha1-x86_64.s \
27+
x64-elf-gas/bn/modexp512-x86_64.s \
2428
x64-elf-gas/bn/x86_64-mont.s \
2529
x64-elf-gas/camellia/cmll-x86_64.s \
2630
x64-elf-gas/md5/md5-x86_64.s \
2731
x64-elf-gas/rc4/rc4-x86_64.s \
32+
x64-elf-gas/rc4/rc4-md5-x86_64.s \
2833
x64-elf-gas/sha/sha1-x86_64.s \
2934
x64-elf-gas/sha/sha512-x86_64.s \
3035
x64-elf-gas/whrlpool/wp-x86_64.s \
3136
x64-elf-gas/x86_64cpuid.s \
3237
x86-macosx-gas/aes/aes-586.s \
38+
x86-macosx-gas/aes/aesni-x86.s \
3339
x86-macosx-gas/bf/bf-686.s \
3440
x86-macosx-gas/bn/x86-mont.s \
3541
x86-macosx-gas/bn/x86.s \
@@ -47,15 +53,20 @@ OUTPUTS = \
4753
x86-macosx-gas/whrlpool/wp-mmx.s \
4854
x86-macosx-gas/x86cpuid.s \
4955
x64-macosx-gas/aes/aes-x86_64.s \
56+
x64-macosx-gas/aes/aesni-x86_64.s \
57+
x64-macosx-gas/aes/aesni-sha1-x86_64.s \
58+
x64-macosx-gas/bn/modexp512-x86_64.s \
5059
x64-macosx-gas/bn/x86_64-mont.s \
5160
x64-macosx-gas/camellia/cmll-x86_64.s \
5261
x64-macosx-gas/md5/md5-x86_64.s \
5362
x64-macosx-gas/rc4/rc4-x86_64.s \
63+
x64-macosx-gas/rc4/rc4-md5-x86_64.s \
5464
x64-macosx-gas/sha/sha1-x86_64.s \
5565
x64-macosx-gas/sha/sha512-x86_64.s \
5666
x64-macosx-gas/whrlpool/wp-x86_64.s \
5767
x64-macosx-gas/x86_64cpuid.s \
5868
x86-win32-masm/aes/aes-586.asm \
69+
x86-win32-masm/aes/aesni-x86.asm \
5970
x86-win32-masm/bf/bf-686.asm \
6071
x86-win32-masm/bn/x86-mont.asm \
6172
x86-win32-masm/bn/x86.asm \
@@ -73,10 +84,14 @@ OUTPUTS = \
7384
x86-win32-masm/whrlpool/wp-mmx.asm \
7485
x86-win32-masm/x86cpuid.asm \
7586
x64-win32-masm/aes/aes-x86_64.asm \
87+
x64-win32-masm/aes/aesni-x86_64.asm \
88+
x64-win32-masm/aes/aesni-sha1-x86_64.asm \
89+
x64-win32-masm/bn/modexp512-x86_64.asm \
7690
x64-win32-masm/bn/x86_64-mont.asm \
7791
x64-win32-masm/camellia/cmll-x86_64.asm \
7892
x64-win32-masm/md5/md5-x86_64.asm \
7993
x64-win32-masm/rc4/rc4-x86_64.asm \
94+
x64-win32-masm/rc4/rc4-md5-x86_64.asm \
8095
x64-win32-masm/sha/sha1-x86_64.asm \
8196
x64-win32-masm/sha/sha512-x86_64.asm \
8297
x64-win32-masm/whrlpool/wp-x86_64.asm \
@@ -104,33 +119,46 @@ clean:
104119
find . -iname '*.s' -exec rm "{}" \;
105120

106121
x64-elf-gas/aes/aes-x86_64.s: ../openssl/crypto/aes/asm/aes-x86_64.pl
122+
x64-elf-gas/aes/aesni-x86_64.s: ../openssl/crypto/aes/asm/aesni-x86_64.pl
123+
x64-elf-gas/aes/aesni-sha1-x86_64.s: ../openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
124+
x64-elf-gas/bn/modexp512-x86_64.s: ../openssl/crypto/bn/asm/modexp512-x86_64.pl
107125
x64-elf-gas/bn/x86_64-mont.s: ../openssl/crypto/bn/asm/x86_64-mont.pl
108126
x64-elf-gas/camellia/cmll-x86_64.s: ../openssl/crypto/camellia/asm/cmll-x86_64.pl
109127
x64-elf-gas/md5/md5-x86_64.s: ../openssl/crypto/md5/asm/md5-x86_64.pl
110128
x64-elf-gas/rc4/rc4-x86_64.s: ../openssl/crypto/rc4/asm/rc4-x86_64.pl
129+
x64-elf-gas/rc4/rc4-md5-x86_64.s: ../openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
111130
x64-elf-gas/sha/sha1-x86_64.s: ../openssl/crypto/sha/asm/sha1-x86_64.pl
112131
x64-elf-gas/sha/sha512-x86_64.s: ../openssl/crypto/sha/asm/sha512-x86_64.pl
113132
x64-elf-gas/whrlpool/wp-x86_64.s: ../openssl/crypto/whrlpool/asm/wp-x86_64.pl
114133
x64-elf-gas/x86_64cpuid.s: ../openssl/crypto/x86_64cpuid.pl
115134
x64-macosx-gas/aes/aes-x86_64.s: ../openssl/crypto/aes/asm/aes-x86_64.pl
135+
x64-macosx-gas/aes/aesni-x86_64.s: ../openssl/crypto/aes/asm/aesni-x86_64.pl
136+
x64-macosx-gas/aes/aesni-sha1-x86_64.s: ../openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
137+
x64-macosx-gas/bn/modexp512-x86_64.s: ../openssl/crypto/bn/asm/modexp512-x86_64.pl
116138
x64-macosx-gas/bn/x86_64-mont.s: ../openssl/crypto/bn/asm/x86_64-mont.pl
117139
x64-macosx-gas/camellia/cmll-x86_64.s: ../openssl/crypto/camellia/asm/cmll-x86_64.pl
118140
x64-macosx-gas/md5/md5-x86_64.s: ../openssl/crypto/md5/asm/md5-x86_64.pl
119141
x64-macosx-gas/rc4/rc4-x86_64.s: ../openssl/crypto/rc4/asm/rc4-x86_64.pl
142+
x64-macosx-gas/rc4/rc4-md5-x86_64.s: ../openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
120143
x64-macosx-gas/sha/sha1-x86_64.s: ../openssl/crypto/sha/asm/sha1-x86_64.pl
121144
x64-macosx-gas/sha/sha512-x86_64.s: ../openssl/crypto/sha/asm/sha512-x86_64.pl
122145
x64-macosx-gas/whrlpool/wp-x86_64.s: ../openssl/crypto/whrlpool/asm/wp-x86_64.pl
123146
x64-macosx-gas/x86_64cpuid.s: ../openssl/crypto/x86_64cpuid.pl
124147
x64-win32-masm/aes/aes-x86_64.asm: ../openssl/crypto/aes/asm/aes-x86_64.pl
148+
x64-win32-masm/aes/aesni-x86_64.asm: ../openssl/crypto/aes/asm/aesni-x86_64.pl
149+
x64-win32-masm/aes/aesni-sha1-x86_64.asm: ../openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
150+
x64-win32-masm/bn/modexp512-x86_64.asm: ../openssl/crypto/bn/asm/modexp512-x86_64.pl
125151
x64-win32-masm/bn/x86_64-mont.asm: ../openssl/crypto/bn/asm/x86_64-mont.pl
126152
x64-win32-masm/camellia/cmll-x86_64.asm: ../openssl/crypto/camellia/asm/cmll-x86_64.pl
127153
x64-win32-masm/md5/md5-x86_64.asm: ../openssl/crypto/md5/asm/md5-x86_64.pl
128154
x64-win32-masm/rc4/rc4-x86_64.asm: ../openssl/crypto/rc4/asm/rc4-x86_64.pl
155+
x64-win32-masm/rc4/rc4-md5-x86_64.asm: ../openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
129156
x64-win32-masm/sha/sha1-x86_64.asm: ../openssl/crypto/sha/asm/sha1-x86_64.pl
130157
x64-win32-masm/sha/sha512-x86_64.asm: ../openssl/crypto/sha/asm/sha512-x86_64.pl
131158
x64-win32-masm/whrlpool/wp-x86_64.asm: ../openssl/crypto/whrlpool/asm/wp-x86_64.pl
132159
x64-win32-masm/x86_64cpuid.asm: ../openssl/crypto/x86_64cpuid.pl
133160
x86-elf-gas/aes/aes-586.s: ../openssl/crypto/aes/asm/aes-586.pl
161+
x86-elf-gas/aes/aesni-x86.s: ../openssl/crypto/aes/asm/aesni-x86.pl
134162
x86-elf-gas/bf/bf-686.s: ../openssl/crypto/bf/asm/bf-686.pl
135163
x86-elf-gas/bn/x86-mont.s: ../openssl/crypto/bn/asm/x86-mont.pl
136164
x86-elf-gas/bn/x86.s: ../openssl/crypto/bn/asm/x86.pl
@@ -148,6 +176,7 @@ x86-elf-gas/sha/sha512-586.s: ../openssl/crypto/sha/asm/sha512-586.pl
148176
x86-elf-gas/whrlpool/wp-mmx.s: ../openssl/crypto/whrlpool/asm/wp-mmx.pl
149177
x86-elf-gas/x86cpuid.s: ../openssl/crypto/x86cpuid.pl
150178
x86-macosx-gas/aes/aes-586.s: ../openssl/crypto/aes/asm/aes-586.pl
179+
x86-macosx-gas/aes/aesni-x86.s: ../openssl/crypto/aes/asm/aesni-x86.pl
151180
x86-macosx-gas/bf/bf-686.s: ../openssl/crypto/bf/asm/bf-686.pl
152181
x86-macosx-gas/bn/x86-mont.s: ../openssl/crypto/bn/asm/x86-mont.pl
153182
x86-macosx-gas/bn/x86.s: ../openssl/crypto/bn/asm/x86.pl
@@ -165,6 +194,7 @@ x86-macosx-gas/sha/sha512-586.s: ../openssl/crypto/sha/asm/sha512-586.pl
165194
x86-macosx-gas/whrlpool/wp-mmx.s: ../openssl/crypto/whrlpool/asm/wp-mmx.pl
166195
x86-macosx-gas/x86cpuid.s: ../openssl/crypto/x86cpuid.pl
167196
x86-win32-masm/aes/aes-586.asm: ../openssl/crypto/aes/asm/aes-586.pl
197+
x86-win32-masm/aes/aesni-x86.asm: ../openssl/crypto/aes/asm/aesni-x86.pl
168198
x86-win32-masm/bf/bf-686.asm: ../openssl/crypto/bf/asm/bf-686.pl
169199
x86-win32-masm/bn/x86.asm: ../openssl/crypto/bn/asm/x86.pl
170200
x86-win32-masm/bn/x86-mont.asm: ../openssl/crypto/bn/asm/x86-mont.pl

deps/openssl/asm/x64-elf-gas/aes/aes-x86_64.s

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@ _x86_64_AES_encrypt_compact:
333333
.globl AES_encrypt
334334
.type AES_encrypt,@function
335335
.align 16
336+
.globl asm_AES_encrypt
337+
.hidden asm_AES_encrypt
338+
asm_AES_encrypt:
336339
AES_encrypt:
337340
pushq %rbx
338341
pushq %rbp
@@ -780,6 +783,9 @@ _x86_64_AES_decrypt_compact:
780783
.globl AES_decrypt
781784
.type AES_decrypt,@function
782785
.align 16
786+
.globl asm_AES_decrypt
787+
.hidden asm_AES_decrypt
788+
asm_AES_decrypt:
783789
AES_decrypt:
784790
pushq %rbx
785791
pushq %rbp
@@ -843,10 +849,10 @@ AES_decrypt:
843849
.Ldec_epilogue:
844850
.byte 0xf3,0xc3
845851
.size AES_decrypt,.-AES_decrypt
846-
.globl AES_set_encrypt_key
847-
.type AES_set_encrypt_key,@function
852+
.globl private_AES_set_encrypt_key
853+
.type private_AES_set_encrypt_key,@function
848854
.align 16
849-
AES_set_encrypt_key:
855+
private_AES_set_encrypt_key:
850856
pushq %rbx
851857
pushq %rbp
852858
pushq %r12
@@ -867,7 +873,7 @@ AES_set_encrypt_key:
867873
addq $56,%rsp
868874
.Lenc_key_epilogue:
869875
.byte 0xf3,0xc3
870-
.size AES_set_encrypt_key,.-AES_set_encrypt_key
876+
.size private_AES_set_encrypt_key,.-private_AES_set_encrypt_key
871877

872878
.type _x86_64_AES_set_encrypt_key,@function
873879
.align 16
@@ -1109,10 +1115,10 @@ _x86_64_AES_set_encrypt_key:
11091115
.byte 0xf3,0xc3
11101116

11111117
.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
1112-
.globl AES_set_decrypt_key
1113-
.type AES_set_decrypt_key,@function
1118+
.globl private_AES_set_decrypt_key
1119+
.type private_AES_set_decrypt_key,@function
11141120
.align 16
1115-
AES_set_decrypt_key:
1121+
private_AES_set_decrypt_key:
11161122
pushq %rbx
11171123
pushq %rbp
11181124
pushq %r12
@@ -1295,11 +1301,14 @@ AES_set_decrypt_key:
12951301
addq $56,%rsp
12961302
.Ldec_key_epilogue:
12971303
.byte 0xf3,0xc3
1298-
.size AES_set_decrypt_key,.-AES_set_decrypt_key
1304+
.size private_AES_set_decrypt_key,.-private_AES_set_decrypt_key
12991305
.globl AES_cbc_encrypt
13001306
.type AES_cbc_encrypt,@function
13011307
.align 16
13021308

1309+
.globl asm_AES_cbc_encrypt
1310+
.hidden asm_AES_cbc_encrypt
1311+
asm_AES_cbc_encrypt:
13031312
AES_cbc_encrypt:
13041313
cmpq $0,%rdx
13051314
je .Lcbc_epilogue

0 commit comments

Comments
 (0)