Update GOST patch

i8e
Arkady L. Shane 9 months ago
parent df8608519e
commit 65673c8b5d
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -4,5 +4,5 @@ dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz
769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz
3e94bb4f999c636293bc745b02d98e7925da5616 SOURCES/node-v20.6.1-linux-arm64.tar.xz 3e94bb4f999c636293bc745b02d98e7925da5616 SOURCES/node-v20.6.1-linux-arm64.tar.xz
8e9bc55cce3899627b2810ecfe87116c5a9147b5 SOURCES/chromium-browser-gost-icons.tar.xz 8e9bc55cce3899627b2810ecfe87116c5a9147b5 SOURCES/chromium-browser-gost-icons.tar.xz
33e9da5833f6119a4a8f2a5598bac91b016a146e SOURCES/Chromium-Gost-147a6fae98a81997a94e8b18ac78bb72d3af70fc.tar.xz 9c34e4bbb988f2ba9297b2c8377957d2a22fa5b0 SOURCES/Chromium-Gost-4c3c5dd30f51e53d152443c7a59640345e5e508e.tar.xz
89db6f7a8e5f9707e748e4027d95e1ad0b0871f2 SOURCES/msspi-70fdcec917ce3799f0786d635422e25a5def92a4.tar.xz 89db6f7a8e5f9707e748e4027d95e1ad0b0871f2 SOURCES/msspi-70fdcec917ce3799f0786d635422e25a5def92a4.tar.xz

2
.gitignore vendored

@ -4,5 +4,5 @@ SOURCES/linux-arm64-0.19.2.tgz
SOURCES/node-v20.6.1-linux-x64.tar.xz SOURCES/node-v20.6.1-linux-x64.tar.xz
SOURCES/node-v20.6.1-linux-arm64.tar.xz SOURCES/node-v20.6.1-linux-arm64.tar.xz
SOURCES/chromium-browser-gost-icons.tar.xz SOURCES/chromium-browser-gost-icons.tar.xz
SOURCES/Chromium-Gost-147a6fae98a81997a94e8b18ac78bb72d3af70fc.tar.xz SOURCES/Chromium-Gost-4c3c5dd30f51e53d152443c7a59640345e5e508e.tar.xz
SOURCES/msspi-70fdcec917ce3799f0786d635422e25a5def92a4.tar.xz SOURCES/msspi-70fdcec917ce3799f0786d635422e25a5def92a4.tar.xz

@ -1,37 +0,0 @@
From f063824bc5744404e4a24b14a6b3f9819a807c02 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Thu, 21 Mar 2024 21:50:59 +0300
Subject: [PATCH] Addon To GOST patch
---
net/ssl/ssl_platform_key_util.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/ssl/ssl_platform_key_util.h b/net/ssl/ssl_platform_key_util.h
index 2c19588228..340a3f5805 100644
--- a/net/ssl/ssl_platform_key_util.h
+++ b/net/ssl/ssl_platform_key_util.h
@@ -15,6 +15,9 @@
#include "base/memory/scoped_refptr.h"
#include "base/task/single_thread_task_runner.h"
#include "net/base/net_export.h"
+#ifndef NO_GOSTSSL
+#include "net/ssl/threaded_ssl_private_key.h"
+#endif // GOSTSSL
#include "third_party/boringssl/src/include/openssl/base.h"
namespace net {
@@ -28,6 +31,10 @@ class X509Certificate;
NET_EXPORT_PRIVATE scoped_refptr<base::SingleThreadTaskRunner>
GetSSLPlatformKeyTaskRunner();
+#ifndef NO_GOSTSSL
+NET_EXPORT_PRIVATE scoped_refptr<SSLPrivateKey> GetEmptyPrivateKey();
+#endif // GOSTSSL
+
// Returns the public key of |certificate| as an |EVP_PKEY| or nullptr on error.
bssl::UniquePtr<EVP_PKEY> GetClientCertPublicKey(
const X509Certificate* certificate);
--
2.44.0

@ -294,7 +294,7 @@
# Build with GOST patches # Build with GOST patches
# https://github.com/deemru/chromium-gost/ # https://github.com/deemru/chromium-gost/
%global gost_build 1 %global gost_build 1
%define chromium_gost_commit 147a6fae98a81997a94e8b18ac78bb72d3af70fc %define chromium_gost_commit 4c3c5dd30f51e53d152443c7a59640345e5e508e
%define msspi_commit 70fdcec917ce3799f0786d635422e25a5def92a4 %define msspi_commit 70fdcec917ce3799f0786d635422e25a5def92a4
%define chromium_path_gost %{_builddir}/chromium-gost %define chromium_path_gost %{_builddir}/chromium-gost
%endif %endif
@ -596,8 +596,6 @@ Patch600: 0001-Yandex-as-default-search-engine.patch
Patch601: 0001-Added-Russian-description-and-summary-for-gnome-soft.patch Patch601: 0001-Added-Russian-description-and-summary-for-gnome-soft.patch
# Yandex Search by default # Yandex Search by default
Patch602: 0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch Patch602: 0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch
# Addon to GOST patch
Patch603: 0001-Addon-To-GOST-patch.patch
# upstream patches # upstream patches
@ -1211,10 +1209,6 @@ do
cp $i $i.saved cp $i $i.saved
done done
# FIX PATCH
sed -i '/diff --git a\/net\/ssl\/ssl_platform_key_util.h/,/const X509Certificate* certificate);/d' \
%{chromium_path_gost}/patch/chromium.patch
patch -p1 < %{chromium_path_gost}/patch/chromium.patch patch -p1 < %{chromium_path_gost}/patch/chromium.patch
patch -p1 -d third_party/boringssl/src < %{chromium_path_gost}/patch/boringssl.patch patch -p1 -d third_party/boringssl/src < %{chromium_path_gost}/patch/boringssl.patch
# rollback backups after GOST patching # rollback backups after GOST patching
@ -1437,7 +1431,6 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P602 -p1 -b .Yandex-as-default-search-engine %patch -P602 -p1 -b .Yandex-as-default-search-engine
%else %else
%patch -P600 -p1 -b .Yandex-as-default-search-engine %patch -P600 -p1 -b .Yandex-as-default-search-engine
%patch -P603 -p1 -b .Addon-to-gost-patch
%endif %endif
# We patch Chromium to open chrome://new-tab-page even with non-Google search engines # We patch Chromium to open chrome://new-tab-page even with non-Google search engines

Loading…
Cancel
Save