diff --git a/patch/boringssl.patch b/patch/boringssl.patch index 05d45e3..160e4dd 100644 --- a/patch/boringssl.patch +++ b/patch/boringssl.patch @@ -1,4 +1,4 @@ -From c9e96f80fb3eb6c5c3c9f32c419d6b261e584cca Mon Sep 17 00:00:00 2001 +From f9ea2ef7d20768d39a541cdadb116cfd093c9b50 Mon Sep 17 00:00:00 2001 From: Dmitrii Pichulin Date: Fri, 14 Jul 2023 15:32:39 +0300 Subject: [PATCH] boringssl GOSTSSL @@ -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 2e19253c2..ef6cf4e98 100644 +index d73f9da9d..651e8016a 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h -@@ -5624,6 +5624,11 @@ BSSL_NAMESPACE_END +@@ -5833,6 +5833,11 @@ BSSL_NAMESPACE_END #endif @@ -31,7 +31,7 @@ index 2e19253c2..ef6cf4e98 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 b13400097..bc2eb0901 100644 +index 20a5d3034..a1dd99ef4 100644 --- a/ssl/extensions.cc +++ b/ssl/extensions.cc @@ -437,6 +437,34 @@ bool tls12_add_verify_sigalgs(const SSL_HANDSHAKE *hs, CBB *out) { @@ -69,7 +69,7 @@ index b13400097..bc2eb0901 100644 return true; } -@@ -2510,6 +2538,23 @@ static bool ext_supported_groups_add_clienthello(const SSL_HANDSHAKE *hs, +@@ -2511,6 +2539,23 @@ static bool ext_supported_groups_add_clienthello(const SSL_HANDSHAKE *hs, } } @@ -94,10 +94,10 @@ index b13400097..bc2eb0901 100644 } diff --git a/ssl/handshake_client.cc b/ssl/handshake_client.cc -index 971ebd0b1..53bfff2cf 100644 +index b958dce23..1a322c765 100644 --- a/ssl/handshake_client.cc +++ b/ssl/handshake_client.cc -@@ -709,6 +709,14 @@ static enum ssl_hs_wait_t do_read_server_hello(SSL_HANDSHAKE *hs) { +@@ -710,6 +710,14 @@ static enum ssl_hs_wait_t do_read_server_hello(SSL_HANDSHAKE *hs) { return ssl_hs_error; } @@ -113,10 +113,10 @@ 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 c9facb699..23cc54d78 100644 +index 0c2c2f86d..95f338251 100644 --- a/ssl/internal.h +++ b/ssl/internal.h -@@ -553,6 +553,13 @@ BSSL_NAMESPACE_BEGIN +@@ -584,6 +584,13 @@ BSSL_NAMESPACE_BEGIN #define SSL_kPSK 0x00000004u #define SSL_kGENERIC 0x00000008u @@ -128,9 +128,9 @@ index c9facb699..23cc54d78 100644 +#endif // GOSTSSL + // Bits for |algorithm_auth| (server authentication). - #define SSL_aRSA 0x00000001u - #define SSL_aECDSA 0x00000002u -@@ -3439,6 +3446,36 @@ void ssl_set_read_error(SSL *ssl); + #define SSL_aRSA_SIGN 0x00000001u + #define SSL_aRSA_DECRYPT 0x00000002u +@@ -3505,6 +3512,36 @@ void ssl_set_read_error(SSL *ssl); BSSL_NAMESPACE_END @@ -168,7 +168,7 @@ index c9facb699..23cc54d78 100644 // Opaque C types. // diff --git a/ssl/s3_both.cc b/ssl/s3_both.cc -index 6d33c6d7d..002c46367 100644 +index 172de90d9..98378399e 100644 --- a/ssl/s3_both.cc +++ b/ssl/s3_both.cc @@ -339,6 +339,14 @@ int tls_flush_flight(SSL *ssl) { @@ -203,7 +203,7 @@ index 2ca14efae..1359e37e7 100644 } diff --git a/ssl/ssl_cipher.cc b/ssl/ssl_cipher.cc -index fd8cef95d..5cd63c6de 100644 +index 29e32ceb2..af53f4a82 100644 --- a/ssl/ssl_cipher.cc +++ b/ssl/ssl_cipher.cc @@ -197,6 +197,20 @@ static constexpr SSL_CIPHER kCiphers[] = { @@ -438,8 +438,8 @@ index fd8cef95d..5cd63c6de 100644 return NID_kx_ecdhe; case SSL_kPSK: return NID_kx_psk; -@@ -1426,6 +1602,9 @@ int SSL_CIPHER_get_auth_nid(const SSL_CIPHER *cipher) { - case SSL_aRSA: +@@ -1427,6 +1603,9 @@ int SSL_CIPHER_get_auth_nid(const SSL_CIPHER *cipher) { + case SSL_aRSA_SIGN: return NID_auth_rsa; case SSL_aECDSA: +#ifndef NO_GOSTSSL @@ -448,7 +448,7 @@ index fd8cef95d..5cd63c6de 100644 return NID_auth_ecdsa; case SSL_aPSK: return NID_auth_psk; -@@ -1549,6 +1728,9 @@ int SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *out_alg_bits) { +@@ -1550,6 +1729,9 @@ int SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *out_alg_bits) { case SSL_AES256: case SSL_AES256GCM: @@ -459,7 +459,7 @@ index fd8cef95d..5cd63c6de 100644 alg_bits = 256; strength_bits = 256; diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc -index 58b68e675..f25aec8e9 100644 +index 98f97ebb2..653bcd1a5 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) { @@ -624,8 +624,8 @@ index 58b68e675..f25aec8e9 100644 +#endif // GOSTSSL + ssl_ctx_st::ssl_ctx_st(const SSL_METHOD *ssl_method) - : method(ssl_method->method), - x509_method(ssl_method->x509_method), + : RefCounted(CheckSubClass()), + method(ssl_method->method), @@ -719,6 +876,11 @@ SSL_CONFIG::~SSL_CONFIG() { } @@ -737,7 +737,7 @@ index 58b68e675..f25aec8e9 100644 if (ssl->do_handshake == NULL) { OPENSSL_PUT_ERROR(SSL, SSL_R_UNINITIALIZED); -@@ -2537,6 +2756,10 @@ EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx) { +@@ -2541,6 +2760,10 @@ EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx) { } const SSL_CIPHER *SSL_get_current_cipher(const SSL *ssl) { diff --git a/patch/chromium.patch b/patch/chromium.patch index cad5865..c23e84b 100644 --- a/patch/chromium.patch +++ b/patch/chromium.patch @@ -1,6 +1,6 @@ -From 27c403345bbf442c55cc55206ee433b48222bea4 Mon Sep 17 00:00:00 2001 +From edbdfeee00ff35c01b040032da766e2958182d45 Mon Sep 17 00:00:00 2001 From: Dmitrii Pichulin -Date: Fri, 22 Mar 2024 15:08:36 +0300 +Date: Wed, 17 Apr 2024 02:55:40 +0300 Subject: [PATCH] chromium GOSTSSL --- @@ -15,7 +15,6 @@ Subject: [PATCH] chromium GOSTSSL chrome/browser/resources/new_tab_page/app.ts | 6 +- .../browser/resources/new_tab_page/logo.html | 5 +- chrome/browser/resources/new_tab_page/logo.ts | 2 +- - .../new_tab_page/realbox/realbox.html | 7 + chrome/browser/search/search.cc | 2 + chrome/browser/shell_integration_linux.cc | 2 +- .../ui/startup/startup_browser_creator.cc | 4 +- @@ -28,7 +27,6 @@ Subject: [PATCH] chromium GOSTSSL chrome/common/net/x509_certificate_model.cc | 2 +- .../chromium-browser/chromium-browser.info | 10 +- .../installer/linux/rpm/chrome.spec.template | 4 + - .../app_shim/certificate_viewer.mm | 46 ++++ components/search_engines/keyword_table.cc | 4 + .../search_engines/prepopulated_engines.json | 12 +- .../search_engines/search_terms_data.cc | 2 +- @@ -61,13 +59,14 @@ Subject: [PATCH] chromium GOSTSSL .../renderer/core/frame/reporting_context.cc | 8 + .../renderer/core/frame/reporting_context.h | 5 + third_party/boringssl/BUILD.generated.gni | 2 + - 57 files changed, 700 insertions(+), 56 deletions(-) + .../cr_components/omnibox/realbox.html | 7 + + 56 files changed, 654 insertions(+), 56 deletions(-) diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 650ae8ca482ab..6c8a7c9f42e43 100644 +index a107e48cbe9d5..a834fdcc65c45 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1533,7 +1533,7 @@ group("extra_resources") { +@@ -1538,7 +1538,7 @@ group("extra_resources") { ] } @@ -76,7 +75,7 @@ index 650ae8ca482ab..6c8a7c9f42e43 100644 if (!is_mac) { _preinstalled_apps_target_type = "copy" } else { -@@ -1577,7 +1577,7 @@ if (!is_android) { +@@ -1582,7 +1582,7 @@ if (!is_android) { deps = [ ":resource_allowlist" ] } @@ -117,10 +116,10 @@ index 79bf119fba775..2350f4b1d19e9 100644 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd -index d8f4d985c660f..13c631b1d24fb 100644 +index ceabbced0f67e..ae958b0be4ec1 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -7542,13 +7542,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7609,13 +7609,10 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -135,10 +134,10 @@ index d8f4d985c660f..13c631b1d24fb 100644 Add shortcut diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb -index 4cf50fd8b754d..b5f2f6f76e1ab 100644 +index 3445b888b2007..c8036263b4772 100644 --- a/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb -@@ -5434,7 +5434,7 @@ +@@ -5446,7 +5446,7 @@ Удаление телефона  – дополнительные настройки @@ -216,10 +215,10 @@ index 55d07e905b96c..70c6e15cfb460 100644 PrefService* pref_service = profile->GetPrefs(); bool hide_web_store_icon = diff --git a/chrome/browser/resources/new_tab_page/app.ts b/chrome/browser/resources/new_tab_page/app.ts -index 9c155734b9d14..a968cbf2da30e 100644 +index 97a1b738fa70d..43806249ad791 100644 --- a/chrome/browser/resources/new_tab_page/app.ts +++ b/chrome/browser/resources/new_tab_page/app.ts -@@ -246,7 +246,7 @@ export class AppElement extends AppElementBase { +@@ -249,7 +249,7 @@ export class AppElement extends AppElementBase { oneGoogleBarEnabled_: { type: Boolean, @@ -228,7 +227,7 @@ index 9c155734b9d14..a968cbf2da30e 100644 }, shortcutsEnabled_: { -@@ -266,12 +266,12 @@ export class AppElement extends AppElementBase { +@@ -269,12 +269,12 @@ export class AppElement extends AppElementBase { middleSlotPromoEnabled_: { type: Boolean, @@ -272,24 +271,8 @@ index 20e943fdaa6b1..81bed94901364 100644 type: Boolean, }, -diff --git a/chrome/browser/resources/new_tab_page/realbox/realbox.html b/chrome/browser/resources/new_tab_page/realbox/realbox.html -index f179a71a80fa1..6ed0546a21311 100644 ---- a/chrome/browser/resources/new_tab_page/realbox/realbox.html -+++ b/chrome/browser/resources/new_tab_page/realbox/realbox.html -@@ -1,4 +1,11 @@ -