Skip to content

GitLab

T
tangled
Commit 6b8131cb authored by davidben's avatar davidben Committed by Commit bot
Browse files
Options

Roll BoringSSL b180ee9..09bdb2a 

Summary of changes available at:
https://boringssl.googlesource.com/boringssl/+log/b180ee9..09bdb2a

BUG=none

Review URL: https://codereview.chromium.org/952293002

Cr-Commit-Position: refs/heads/master@{#318145}
parent 64cc2d9a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 111 deletions
DEPS
View file @ 6b8131cb
...@@ -75,7 +75,7 @@ vars = { ...@@ -75,7 +75,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL # the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other. # and whatever else without interference from each other.
'boringssl_revision': 'b180ee98a60149dd3fd07cce4e834494c9d5b31c', 'boringssl_revision': '09bdb2a2c3d40646ac4b20f5e73421307a80185f',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling nss # the commit queue can handle CLs rolling nss
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
net/socket/ssl_client_socket_openssl.cc
View file @ 6b8131cb
...@@ -820,6 +820,8 @@ int SSLClientSocketOpenSSL::Init() { ...@@ -820,6 +820,8 @@ int SSLClientSocketOpenSSL::Init() {
mode.ConfigureFlag(SSL_MODE_ENABLE_FALSE_START, mode.ConfigureFlag(SSL_MODE_ENABLE_FALSE_START,
ssl_config_.false_start_enabled); ssl_config_.false_start_enabled);
mode.ConfigureFlag(SSL_MODE_SEND_FALLBACK_SCSV, ssl_config_.version_fallback);
SSL_set_mode(ssl_, mode.set_mask); SSL_set_mode(ssl_, mode.set_mask);
SSL_clear_mode(ssl_, mode.clear_mask); SSL_clear_mode(ssl_, mode.clear_mask);
...@@ -873,9 +875,6 @@ int SSLClientSocketOpenSSL::Init() { ...@@ -873,9 +875,6 @@ int SSLClientSocketOpenSSL::Init() {
LOG_IF(WARNING, rv != 1) << "SSL_set_cipher_list('" << command << "') " LOG_IF(WARNING, rv != 1) << "SSL_set_cipher_list('" << command << "') "
"returned " << rv; "returned " << rv;
if (ssl_config_.version_fallback)
SSL_enable_fallback_scsv(ssl_);
// TLS channel ids. // TLS channel ids.
if (IsChannelIDEnabled(ssl_config_, channel_id_service_)) { if (IsChannelIDEnabled(ssl_config_, channel_id_service_)) {
SSL_enable_tls_channel_id(ssl_); SSL_enable_tls_channel_id(ssl_);
......
third_party/boringssl/linux-arm/crypto/bn/armv4-mont.S
View file @ 6b8131cb
...@@ -572,4 +572,5 @@ bn_mul8x_mont_neon: ...@@ -572,4 +572,5 @@ bn_mul8x_mont_neon:
.align 2 .align 2
#if __ARM_ARCH__>=7 #if __ARM_ARCH__>=7
.comm OPENSSL_armcap_P,4,4 .comm OPENSSL_armcap_P,4,4
.hidden OPENSSL_armcap_P
#endif #endif
third_party/boringssl/linux-arm/crypto/sha/sha1-armv4-large.S
View file @ 6b8131cb
...@@ -1452,4 +1452,5 @@ sha1_block_data_order_armv8: ...@@ -1452,4 +1452,5 @@ sha1_block_data_order_armv8:
#endif #endif
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
.comm OPENSSL_armcap_P,4,4 .comm OPENSSL_armcap_P,4,4
.hidden OPENSSL_armcap_P
#endif #endif
third_party/boringssl/linux-arm/crypto/sha/sha256-armv4.S
View file @ 6b8131cb
...@@ -2692,4 +2692,5 @@ sha256_block_data_order_armv8: ...@@ -2692,4 +2692,5 @@ sha256_block_data_order_armv8:
.align 2 .align 2
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
.comm OPENSSL_armcap_P,4,4 .comm OPENSSL_armcap_P,4,4
.hidden OPENSSL_armcap_P
#endif #endif
third_party/boringssl/linux-arm/crypto/sha/sha512-armv4.S
View file @ 6b8131cb
...@@ -1772,4 +1772,5 @@ sha512_block_data_order: ...@@ -1772,4 +1772,5 @@ sha512_block_data_order:
.align 2 .align 2
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
.comm OPENSSL_armcap_P,4,4 .comm OPENSSL_armcap_P,4,4
.hidden OPENSSL_armcap_P
#endif #endif
third_party/boringssl/linux-x86/crypto/cpu-x86-asm.S
View file @ 6b8131cb
...@@ -101,10 +101,6 @@ OPENSSL_ia32_cpuid: ...@@ -101,10 +101,6 @@ OPENSSL_ia32_cpuid:
cmpl $0,%ebp cmpl $0,%ebp
jne .L005notintel jne .L005notintel
orl $1073741824,%edx orl $1073741824,%edx
andb $15,%ah
cmpb $15,%ah
jne .L005notintel
orl $1048576,%edx
.L005notintel: .L005notintel:
btl $28,%edx btl $28,%edx
jnc .L002generic jnc .L002generic
......
third_party/boringssl/linux-x86_64/crypto/cpu-x86_64-asm.S
View file @ 6b8131cb
...@@ -104,10 +104,6 @@ OPENSSL_ia32_cpuid: ...@@ -104,10 +104,6 @@ OPENSSL_ia32_cpuid:
cmpl $0,%r9d cmpl $0,%r9d
jne .Lnotintel jne .Lnotintel
orl $1073741824,%edx orl $1073741824,%edx
andb $15,%ah
cmpb $15,%ah
jne .Lnotintel
orl $1048576,%edx
.Lnotintel: .Lnotintel:
btl $28,%edx btl $28,%edx
jnc .Lgeneric jnc .Lgeneric
......
third_party/boringssl/linux-x86_64/crypto/rc4/rc4-x86_64.S
View file @ 6b8131cb
...@@ -592,31 +592,4 @@ asm_RC4_set_key: ...@@ -592,31 +592,4 @@ asm_RC4_set_key:
movl %eax,-4(%rdi) movl %eax,-4(%rdi)
.byte 0xf3,0xc3 .byte 0xf3,0xc3
.size asm_RC4_set_key,.-asm_RC4_set_key .size asm_RC4_set_key,.-asm_RC4_set_key
.globl RC4_options
.hidden RC4_options
.type RC4_options,@function
.align 16
RC4_options:
leaq .Lopts(%rip),%rax
movq OPENSSL_ia32cap_P(%rip),%rdx
movl (%rdx),%edx
btl $20,%edx
jc .L8xchar
btl $30,%edx
jnc .Ldone
addq $25,%rax
.byte 0xf3,0xc3
.L8xchar:
addq $12,%rax
.Ldone:
.byte 0xf3,0xc3
.align 64
.Lopts:
.byte 114,99,52,40,56,120,44,105,110,116,41,0
.byte 114,99,52,40,56,120,44,99,104,97,114,41,0
.byte 114,99,52,40,49,54,120,44,105,110,116,41,0
.byte 82,67,52,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
.align 64
.size RC4_options,.-RC4_options
#endif #endif
third_party/boringssl/mac-x86/crypto/cpu-x86-asm.S
View file @ 6b8131cb
...@@ -100,10 +100,6 @@ L004nocacheinfo: ...@@ -100,10 +100,6 @@ L004nocacheinfo:
cmpl $0,%ebp cmpl $0,%ebp
jne L005notintel jne L005notintel
orl $1073741824,%edx orl $1073741824,%edx
andb $15,%ah
cmpb $15,%ah
jne L005notintel
orl $1048576,%edx
L005notintel: L005notintel:
btl $28,%edx btl $28,%edx
jnc L002generic jnc L002generic
......
third_party/boringssl/mac-x86_64/crypto/cpu-x86_64-asm.S
View file @ 6b8131cb
...@@ -104,10 +104,6 @@ L$nocacheinfo: ...@@ -104,10 +104,6 @@ L$nocacheinfo:
cmpl $0,%r9d cmpl $0,%r9d
jne L$notintel jne L$notintel
orl $1073741824,%edx orl $1073741824,%edx
andb $15,%ah
cmpb $15,%ah
jne L$notintel
orl $1048576,%edx
L$notintel: L$notintel:
btl $28,%edx btl $28,%edx
jnc L$generic jnc L$generic
......
third_party/boringssl/mac-x86_64/crypto/rc4/rc4-x86_64.S
View file @ 6b8131cb
...@@ -592,31 +592,4 @@ L$exit_key: ...@@ -592,31 +592,4 @@ L$exit_key:
movl %eax,-4(%rdi) movl %eax,-4(%rdi)
.byte 0xf3,0xc3 .byte 0xf3,0xc3
.globl _RC4_options
.private_extern _RC4_options
.p2align 4
_RC4_options:
leaq L$opts(%rip),%rax
movq _OPENSSL_ia32cap_P(%rip),%rdx
movl (%rdx),%edx
btl $20,%edx
jc L$8xchar
btl $30,%edx
jnc L$done
addq $25,%rax
.byte 0xf3,0xc3
L$8xchar:
addq $12,%rax
L$done:
.byte 0xf3,0xc3
.p2align 6
L$opts:
.byte 114,99,52,40,56,120,44,105,110,116,41,0
.byte 114,99,52,40,56,120,44,99,104,97,114,41,0
.byte 114,99,52,40,49,54,120,44,105,110,116,41,0
.byte 82,67,52,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
.p2align 6
#endif #endif
third_party/boringssl/win-x86/crypto/cpu-x86-asm.asm
View file @ 6b8131cb
...@@ -112,10 +112,6 @@ L$004nocacheinfo: ...@@ -112,10 +112,6 @@ L$004nocacheinfo:
cmp ebp,0 cmp ebp,0
jne NEAR L$005notintel jne NEAR L$005notintel
or edx,1073741824 or edx,1073741824
and ah,15
cmp ah,15
jne NEAR L$005notintel
or edx,1048576
L$005notintel: L$005notintel:
bt edx,28 bt edx,28
jnc NEAR L$002generic jnc NEAR L$002generic
......
third_party/boringssl/win-x86_64/crypto/cpu-x86_64-asm.asm
View file @ 6b8131cb
...@@ -114,10 +114,6 @@ $L$nocacheinfo: ...@@ -114,10 +114,6 @@ $L$nocacheinfo:
cmp r9d,0 cmp r9d,0
jne NEAR $L$notintel jne NEAR $L$notintel
or edx,0x40000000 or edx,0x40000000
and ah,15
cmp ah,15
jne NEAR $L$notintel
or edx,0x00100000
$L$notintel: $L$notintel:
bt edx,28 bt edx,28
jnc NEAR $L$generic jnc NEAR $L$generic
......
third_party/boringssl/win-x86_64/crypto/rc4/rc4-x86_64.asm
View file @ 6b8131cb
...@@ -619,35 +619,6 @@ $L$exit_key: ...@@ -619,35 +619,6 @@ $L$exit_key:
mov rsi,QWORD[16+rsp] mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret DB 0F3h,0C3h ;repret
$L$SEH_end_asm_RC4_set_key: $L$SEH_end_asm_RC4_set_key:
global RC4_options
ALIGN 16
RC4_options:
lea rax,[$L$opts]
mov rdx,QWORD[OPENSSL_ia32cap_P]
mov edx,DWORD[rdx]
bt edx,20
jc NEAR $L$8xchar
bt edx,30
jnc NEAR $L$done
add rax,25
DB 0F3h,0C3h ;repret
$L$8xchar:
add rax,12
$L$done:
DB 0F3h,0C3h ;repret
ALIGN 64
$L$opts:
DB 114,99,52,40,56,120,44,105,110,116,41,0
DB 114,99,52,40,56,120,44,99,104,97,114,41,0
DB 114,99,52,40,49,54,120,44,105,110,116,41,0
DB 82,67,52,32,102,111,114,32,120,56,54,95,54,52,44,32
DB 67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
DB 112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
DB 62,0
ALIGN 64
EXTERN __imp_RtlVirtualUnwind EXTERN __imp_RtlVirtualUnwind
ALIGN 16 ALIGN 16
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment