Skip to content

Commit

Permalink
adopt patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@deemru
deemru committed Dec 6, 2023
1 parent 1765fb6 commit 0842c9b
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 77 deletions.
32 changes: 16 additions & 16 deletions patch/boringssl.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a43e127543aa667fd60df9ec2a63f0f954488644 Mon Sep 17 00:00:00 2001
From 46e52c83742905e3a6dadcbbc3d8f8ef334c7334 Mon Sep 17 00:00:00 2001
From: Dmitrii Pichulin <[email protected]>
Date: Fri, 14 Jul 2023 15:32:39 +0300
Subject: [PATCH] boringssl GOSTSSL
Expand All @@ -15,10 +15,10 @@ Subject: [PATCH] boringssl GOSTSSL
8 files changed, 513 insertions(+)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index f8f696b8d..ad3dadd6c 100644
index e500dd76e..e6c0b9c80 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -5589,6 +5589,11 @@ BSSL_NAMESPACE_END
@@ -5620,6 +5620,11 @@ BSSL_NAMESPACE_END

#endif

Expand All @@ -31,7 +31,7 @@ index f8f696b8d..ad3dadd6c 100644
#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 101
#define SSL_R_BAD_ALERT 102
diff --git a/ssl/extensions.cc b/ssl/extensions.cc
index c5b1ed143..a005303e6 100644
index b13400097..bc2eb0901 100644
--- a/ssl/extensions.cc
+++ b/ssl/extensions.cc
@@ -437,6 +437,34 @@ bool tls12_add_verify_sigalgs(const SSL_HANDSHAKE *hs, CBB *out) {
Expand Down Expand Up @@ -113,7 +113,7 @@ index 971ebd0b1..53bfff2cf 100644
OPENSSL_PUT_ERROR(SSL, SSL_R_UNSUPPORTED_PROTOCOL);
ssl_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_PROTOCOL_VERSION);
diff --git a/ssl/internal.h b/ssl/internal.h
index fa35073fa..0cf17863f 100644
index c9facb699..23cc54d78 100644
--- a/ssl/internal.h
+++ b/ssl/internal.h
@@ -553,6 +553,13 @@ BSSL_NAMESPACE_BEGIN
Expand All @@ -130,7 +130,7 @@ index fa35073fa..0cf17863f 100644
// Bits for |algorithm_auth| (server authentication).
#define SSL_aRSA 0x00000001u
#define SSL_aECDSA 0x00000002u
@@ -3435,6 +3442,36 @@ void ssl_set_read_error(SSL *ssl);
@@ -3439,6 +3446,36 @@ void ssl_set_read_error(SSL *ssl);

BSSL_NAMESPACE_END

Expand Down Expand Up @@ -203,7 +203,7 @@ index 2ca14efae..1359e37e7 100644
}

diff --git a/ssl/ssl_cipher.cc b/ssl/ssl_cipher.cc
index 6f2098981..a4d1d2e5f 100644
index fd8cef95d..5cd63c6de 100644
--- a/ssl/ssl_cipher.cc
+++ b/ssl/ssl_cipher.cc
@@ -197,6 +197,20 @@ static constexpr SSL_CIPHER kCiphers[] = {
Expand Down Expand Up @@ -459,7 +459,7 @@ index 6f2098981..a4d1d2e5f 100644
alg_bits = 256;
strength_bits = 256;
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
index d7b5be3dd..27ac298bb 100644
index 58b68e675..f25aec8e9 100644
--- a/ssl/ssl_lib.cc
+++ b/ssl/ssl_lib.cc
@@ -522,6 +522,163 @@ static int ssl_session_cmp(const SSL_SESSION *a, const SSL_SESSION *b) {
Expand Down Expand Up @@ -626,7 +626,7 @@ index d7b5be3dd..27ac298bb 100644
ssl_ctx_st::ssl_ctx_st(const SSL_METHOD *ssl_method)
: method(ssl_method->method),
x509_method(ssl_method->x509_method),
@@ -718,6 +875,11 @@ SSL_CONFIG::~SSL_CONFIG() {
@@ -719,6 +876,11 @@ SSL_CONFIG::~SSL_CONFIG() {
}

void SSL_free(SSL *ssl) {
Expand All @@ -638,7 +638,7 @@ index d7b5be3dd..27ac298bb 100644
Delete(ssl);
}

@@ -847,6 +1009,15 @@ int SSL_provide_quic_data(SSL *ssl, enum ssl_encryption_level_t level,
@@ -848,6 +1010,15 @@ int SSL_provide_quic_data(SSL *ssl, enum ssl_encryption_level_t level,

int SSL_do_handshake(SSL *ssl) {
ssl_reset_error_state(ssl);
Expand All @@ -654,7 +654,7 @@ index d7b5be3dd..27ac298bb 100644

if (ssl->do_handshake == NULL) {
OPENSSL_PUT_ERROR(SSL, SSL_R_CONNECTION_TYPE_NOT_SET);
@@ -865,6 +1036,18 @@ int SSL_do_handshake(SSL *ssl) {
@@ -866,6 +1037,18 @@ int SSL_do_handshake(SSL *ssl) {
ssl_do_info_callback(
ssl, ssl->server ? SSL_CB_ACCEPT_EXIT : SSL_CB_CONNECT_EXIT, ret);
if (ret <= 0) {
Expand All @@ -673,7 +673,7 @@ index d7b5be3dd..27ac298bb 100644
return ret;
}

@@ -1029,6 +1212,15 @@ static int ssl_read_impl(SSL *ssl) {
@@ -1030,6 +1213,15 @@ static int ssl_read_impl(SSL *ssl) {
}

int SSL_read(SSL *ssl, void *buf, int num) {
Expand All @@ -689,7 +689,7 @@ index d7b5be3dd..27ac298bb 100644
int ret = SSL_peek(ssl, buf, num);
if (ret <= 0) {
return ret;
@@ -1044,6 +1236,15 @@ int SSL_read(SSL *ssl, void *buf, int num) {
@@ -1045,6 +1237,15 @@ int SSL_read(SSL *ssl, void *buf, int num) {
}

int SSL_peek(SSL *ssl, void *buf, int num) {
Expand All @@ -705,7 +705,7 @@ index d7b5be3dd..27ac298bb 100644
if (ssl->quic_method != nullptr) {
OPENSSL_PUT_ERROR(SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
return -1;
@@ -1064,6 +1265,15 @@ int SSL_peek(SSL *ssl, void *buf, int num) {
@@ -1065,6 +1266,15 @@ int SSL_peek(SSL *ssl, void *buf, int num) {

int SSL_write(SSL *ssl, const void *buf, int num) {
ssl_reset_error_state(ssl);
Expand All @@ -721,7 +721,7 @@ index d7b5be3dd..27ac298bb 100644

if (ssl->quic_method != nullptr) {
OPENSSL_PUT_ERROR(SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -1136,6 +1346,15 @@ int SSL_key_update(SSL *ssl, int request_type) {
@@ -1137,6 +1347,15 @@ int SSL_key_update(SSL *ssl, int request_type) {

int SSL_shutdown(SSL *ssl) {
ssl_reset_error_state(ssl);
Expand All @@ -737,7 +737,7 @@ index d7b5be3dd..27ac298bb 100644

if (ssl->do_handshake == NULL) {
OPENSSL_PUT_ERROR(SSL, SSL_R_UNINITIALIZED);
@@ -2527,6 +2746,10 @@ EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx) {
@@ -2537,6 +2756,10 @@ EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx) {
}

const SSL_CIPHER *SSL_get_current_cipher(const SSL *ssl) {
Expand Down
38 changes: 19 additions & 19 deletions patch/bubble.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 8a8ab66f173efacd97c9e3c544bd2e258fdfffec Mon Sep 17 00:00:00 2001
From c31f42efa3d7a8c12d580a6b3eaf6c727deaa7ac Mon Sep 17 00:00:00 2001
From: Dmitrii Pichulin <[email protected]>
Date: Wed, 8 Nov 2023 18:10:26 +0300
Date: Wed, 6 Dec 2023 03:04:30 +0300
Subject: [PATCH] Revert "Remove Download Bubble flags"

revert 3629ca9973f6460137c40ddca7e1fdffd045c3a7 && 118 -> -1
Expand All @@ -13,10 +13,10 @@ revert 3629ca9973f6460137c40ddca7e1fdffd045c3a7 && 118 -> -1
5 files changed, 40 insertions(+)

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 32e2e14cdb2d9..2f672cc60ef71 100644
index 8736a91998f6b..016ec681fc039 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -9940,6 +9940,16 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9874,6 +9874,16 @@ const FeatureEntry kFeatureEntries[] = {
"IsolateSandboxedIframes" /* trial name */)},
#endif

Expand All @@ -34,12 +34,12 @@ index 32e2e14cdb2d9..2f672cc60ef71 100644
flag_descriptions::kDownloadWarningImprovementsName,
flag_descriptions::kDownloadWarningImprovementsDescription,
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 60d6876953def..8506a63fe8503 100644
index 400505f9d64e6..4776eceaebe70 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -1903,6 +1903,16 @@
"owners": [ "shaktisahu", "qinmin" ],
"expiry_milestone": 96
@@ -1797,6 +1797,16 @@
"owners": [ "[email protected]", "[email protected]" ],
"expiry_milestone": 85
},
+ {
+ "name": "download-bubble",
Expand All @@ -52,13 +52,13 @@ index 60d6876953def..8506a63fe8503 100644
+ "expiry_milestone": -1
+ },
{
"name": "download-later",
"owners": [ "xingliu", "dtrainor" ],
"name": "download-notification-service-unified-api",
"owners": ["[email protected]", "[email protected]"],
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index d33d6d04c130e..a6868fe3e7fb9 100644
index f92c5df0fc600..50c28156c7a17 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1254,6 +1254,16 @@ const char kExperimentalRgbKeyboardPatternsName[] =
@@ -1210,6 +1210,16 @@ const char kExperimentalRgbKeyboardPatternsName[] =
const char kExperimentalRgbKeyboardPatternsDescription[] =
"Enable experimental RGB Keyboard patterns support on supported devices.";

Expand All @@ -76,10 +76,10 @@ index d33d6d04c130e..a6868fe3e7fb9 100644
const char kDownloadRangeDescription[] =
"Enables arbitrary download range request support.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 89d8ca8a55114..a372632c29aaa 100644
index 71eae84724eab..454e229f483b2 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -743,6 +743,12 @@ extern const char kMemlogStackModeDescription[];
@@ -726,6 +726,12 @@ extern const char kMemlogStackModeDescription[];
extern const char kMemlogStackModeNative[];
extern const char kMemlogStackModeNativeWithThreadNames[];

Expand All @@ -93,34 +93,34 @@ index 89d8ca8a55114..a372632c29aaa 100644
extern const char kDownloadRangeDescription[];

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 75e5eeb9cc761..4821d346cb457 100644
index 83291c4f39d57..a5bd9072580b1 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -61165,6 +61165,7 @@ from previous Chrome versions.
@@ -61833,6 +61833,7 @@ from previous Chrome versions.
<int value="-1983891525" label="DecodeJpeg420ImagesToYUV:disabled"/>
<int value="-1983569861" label="WebXROrientationSensorDevice:disabled"/>
<int value="-1982700103" label="EnableAppsGridGapFeature:enabled"/>
+ <int value="-1982298556" label="DownloadBubble:disabled"/>
<int value="-1982080540" label="DurableClientHintsCache:disabled"/>
<int value="-1981692093"
label="SafeBrowsingPasswordProtectionForSignedInUsers:enabled"/>
@@ -62653,6 +62654,7 @@ from previous Chrome versions.
@@ -63343,6 +63344,7 @@ from previous Chrome versions.
<int value="-1262302650" label="StorageBuckets:disabled"/>
<int value="-1262152606" label="disable-lock-screen-apps"/>
<int value="-1261972671" label="OmniboxDocumentProvider:disabled"/>
+ <int value="-1261699926" label="DownloadBubbleV2:disabled"/>
<int value="-1261263046"
label="RemoveUsageOfDeprecatedGaiaSigninEndpoint:disabled"/>
<int value="-1261110018" label="AllowDisableTouchpadHapticFeedback:disabled"/>
@@ -62801,6 +62803,7 @@ from previous Chrome versions.
@@ -63492,6 +63494,7 @@ from previous Chrome versions.
<int value="-1195034892" label="ContinuousSearch:disabled"/>
<int value="-1194747282" label="kNearbySharingSelfShare:enabled"/>
<int value="-1194129602" label="ClientSideDetectionModelOnAndroid:disabled"/>
+ <int value="-1193375480" label="DownloadBubble:enabled"/>
<int value="-1192790333" label="ArcUseHighMemoryDalvikProfile:disabled"/>
<int value="-1192334995" label="CrOSLateBootAudioHFPOffload:enabled"/>
<int value="-1191671217" label="TabGroupsNewBadgePromo:disabled"/>
@@ -63406,6 +63409,7 @@ from previous Chrome versions.
@@ -64109,6 +64112,7 @@ from previous Chrome versions.
<int value="-892428689" label="ManualPasswordGenerationAndroid:enabled"/>
<int value="-892297699" label="EditContext:enabled"/>
<int value="-891856063" label="MidiManagerAndroid:enabled"/>
Expand Down
Loading

0 comments on commit 0842c9b

Please sign in to comment.