-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
16 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 95c05cd2d1a37253933e137cfa744ff52c3af7f5 Mon Sep 17 00:00:00 2001 | ||
From 94875860e6c372b1c92a263f5b7df1469fee9ebb Mon Sep 17 00:00:00 2001 | ||
From: Dmitrii Pichulin <[email protected]> | ||
Date: Tue, 23 Jan 2024 21:43:47 +0300 | ||
Subject: [PATCH] chromium GOSTSSL | ||
|
@@ -25,6 +25,7 @@ Subject: [PATCH] chromium GOSTSSL | |
.../ui/webui/whats_new/whats_new_util.cc | 2 +- | ||
chrome/common/channel_info_posix.cc | 2 +- | ||
chrome/common/chrome_constants.cc | 2 +- | ||
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 ++++ | ||
|
@@ -60,7 +61,7 @@ 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 + | ||
56 files changed, 691 insertions(+), 55 deletions(-) | ||
57 files changed, 692 insertions(+), 56 deletions(-) | ||
|
||
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn | ||
index ef32e9c1315f9..51eee92a53f8f 100644 | ||
|
@@ -462,6 +463,19 @@ index 064cb8fef1f1b..79c3fa64724da 100644 | |
#else | ||
#error Unknown branding | ||
#endif | ||
diff --git a/chrome/common/net/x509_certificate_model.cc b/chrome/common/net/x509_certificate_model.cc | ||
index cccaaff02b603..1ab6a111eac82 100644 | ||
--- a/chrome/common/net/x509_certificate_model.cc | ||
+++ b/chrome/common/net/x509_certificate_model.cc | ||
@@ -555,7 +555,7 @@ std::string ProcessRDN(const bssl::RelativeDistinguishedName& rdn) { | ||
std::string value; | ||
if (!name_attribute.ValueAsStringWithUnsafeOptions(kNameStringHandling, | ||
&value)) { | ||
- return std::string(); | ||
+ value = "(not decoded)"; | ||
} | ||
rv += " = "; | ||
if (name_attribute.type == bssl::der::Input(bssl::kTypeCommonNameOid)) { | ||
diff --git a/chrome/installer/linux/common/chromium-browser/chromium-browser.info b/chrome/installer/linux/common/chromium-browser/chromium-browser.info | ||
index a236102f75ab5..d29fc42fa8d13 100644 | ||
--- a/chrome/installer/linux/common/chromium-browser/chromium-browser.info | ||
|