Skip to content

Commit 4e96f8c

Browse files
committed
Bug 1928110 - Vendor libwebrtc from d79a1859e0
Upstream commit: https://webrtc.googlesource.com/src/+/d79a1859e058b6a030177b24ed8e4bb14525af79 ssl: increase default RSA key size to 2048 bits since 1024 is already deprecated by OpenSSL and causes "too small key" issues on systems enforcing a minimum size. Similar issue here: nodejs/node#44498 The minimum key size is not yet changed from 1024, this will require more effort for deprecation. BUG=webrtc:364338811 Change-Id: Id4b24a2c289ec5e3f112288d32b8ac697ba1cfed Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361128 Reviewed-by: David Benjamin <davidbenwebrtc.org> Reviewed-by: Harald Alvestrand <htawebrtc.org> Commit-Queue: Philipp Hancke <phanckemeta.com> Cr-Commit-Position: refs/heads/main{#43110} UltraBlame original commit: a674447f7a1f2d87718780cf2311b324c10f5384
1 parent 062cf8e commit 4e96f8c

7 files changed

+822
-295
lines changed

third_party/libwebrtc/README.moz-ff-commit

+47
Original file line numberDiff line numberDiff line change
@@ -515999,3 +515999,50 @@ of
515999515999
lastest
516000516000
vendoring
516001516001
a6fbb35ac1
516002+
#
516003+
MOZ_LIBWEBRTC_SRC
516004+
=
516005+
/
516006+
home
516007+
/
516008+
mfroman
516009+
/
516010+
mozilla
516011+
/
516012+
elm
516013+
/
516014+
.
516015+
moz
516016+
-
516017+
fast
516018+
-
516019+
forward
516020+
/
516021+
moz
516022+
-
516023+
libwebrtc
516024+
MOZ_LIBWEBRTC_BRANCH
516025+
=
516026+
mozpatches
516027+
bash
516028+
dom
516029+
/
516030+
media
516031+
/
516032+
webrtc
516033+
/
516034+
third_party_build
516035+
/
516036+
fast
516037+
-
516038+
forward
516039+
-
516040+
libwebrtc
516041+
.
516042+
sh
516043+
#
516044+
base
516045+
of
516046+
lastest
516047+
vendoring
516048+
d79a1859e0

third_party/libwebrtc/README.mozilla

+84
Original file line numberDiff line numberDiff line change
@@ -860174,3 +860174,87 @@ on
860174860174
.
860175860175
280581
860176860176
.
860177+
#
860178+
.
860179+
/
860180+
mach
860181+
python
860182+
dom
860183+
/
860184+
media
860185+
/
860186+
webrtc
860187+
/
860188+
third_party_build
860189+
/
860190+
vendor
860191+
-
860192+
libwebrtc
860193+
.
860194+
py
860195+
-
860196+
-
860197+
from
860198+
-
860199+
local
860200+
/
860201+
home
860202+
/
860203+
mfroman
860204+
/
860205+
mozilla
860206+
/
860207+
elm
860208+
/
860209+
.
860210+
moz
860211+
-
860212+
fast
860213+
-
860214+
forward
860215+
/
860216+
moz
860217+
-
860218+
libwebrtc
860219+
-
860220+
-
860221+
commit
860222+
mozpatches
860223+
libwebrtc
860224+
libwebrtc
860225+
updated
860226+
from
860227+
/
860228+
home
860229+
/
860230+
mfroman
860231+
/
860232+
mozilla
860233+
/
860234+
elm
860235+
/
860236+
.
860237+
moz
860238+
-
860239+
fast
860240+
-
860241+
forward
860242+
/
860243+
moz
860244+
-
860245+
libwebrtc
860246+
commit
860247+
mozpatches
860248+
on
860249+
2024
860250+
-
860251+
11
860252+
-
860253+
19T17
860254+
:
860255+
36
860256+
:
860257+
24
860258+
.
860259+
201635
860260+
.

third_party/libwebrtc/rtc_base/boringssl_identity.cc

+6
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,12 @@ err
931931
PEM_R_NO_START_LINE
932932
)
933933
{
934+
err
935+
=
936+
ERR_get_error
937+
(
938+
)
939+
;
934940
break
935941
;
936942
}

third_party/libwebrtc/rtc_base/openssl_identity.cc

+6
Original file line numberDiff line numberDiff line change
@@ -926,6 +926,12 @@ err
926926
PEM_R_NO_START_LINE
927927
)
928928
{
929+
err
930+
=
931+
ERR_get_error
932+
(
933+
)
934+
;
929935
break
930936
;
931937
}

third_party/libwebrtc/rtc_base/openssl_stream_adapter.cc

+36
Original file line numberDiff line numberDiff line change
@@ -6894,11 +6894,29 @@ endif
68946894
#
68956895
ifdef
68966896
TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
6897+
/
6898+
/
6899+
BoringSSL
6900+
.
68976901
CDEF
68986902
(
68996903
ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
69006904
)
69016905
#
6906+
elif
6907+
defined
6908+
(
6909+
TLS1_RFC_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
6910+
)
6911+
/
6912+
/
6913+
OpenSSL
6914+
.
6915+
CDEF
6916+
(
6917+
ECDHE_RSA_WITH_CHACHA20_POLY1305
6918+
)
6919+
#
69026920
endif
69036921
}
69046922
;
@@ -6934,11 +6952,29 @@ endif
69346952
#
69356953
ifdef
69366954
TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
6955+
/
6956+
/
6957+
BoringSSL
6958+
.
69376959
CDEF
69386960
(
69396961
ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
69406962
)
69416963
#
6964+
elif
6965+
defined
6966+
(
6967+
TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
6968+
)
6969+
/
6970+
/
6971+
OpenSSL
6972+
.
6973+
CDEF
6974+
(
6975+
ECDHE_ECDSA_WITH_CHACHA20_POLY1305
6976+
)
6977+
#
69426978
endif
69436979
}
69446980
;

third_party/libwebrtc/rtc_base/ssl_identity.h

+21-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ const
210210
int
211211
kRsaDefaultModSize
212212
=
213-
1024
213+
2048
214214
;
215215
static
216216
const
@@ -229,6 +229,26 @@ kRsaDefaultExponent
229229
1
230230
=
231231
65537
232+
/
233+
/
234+
TODO
235+
(
236+
bugs
237+
.
238+
webrtc
239+
.
240+
org
241+
/
242+
364338811
243+
)
244+
:
245+
raise
246+
the
247+
bar
248+
to
249+
2048
250+
bits
251+
.
232252
static
233253
const
234254
int

0 commit comments

Comments
 (0)