Skip to content

Fix os_crypt_win patch #4194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crazy-max wants to merge 1 commit into from
Closed

Fix os_crypt_win patch #4194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions patches/components-os_crypt-os_crypt_win.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
diff --git a/components/os_crypt/os_crypt_win.cc b/components/os_crypt/os_crypt_win.cc
index 792233d4405f115f4fc72423dad10c415f4df66b..1fb45bb390dba292b3a075dad620a3b7e73ccd84 100644
index 8a7f33e76963..ca64e70f4a76 100644
--- a/components/os_crypt/os_crypt_win.cc
+++ b/components/os_crypt/os_crypt_win.cc
@@ -26,6 +26,7 @@ bool OSCrypt::DecryptString16(const std::string& ciphertext,

@@ -134,6 +134,7 @@ bool OSCrypt::DecryptString16(const std::string& ciphertext,
// static
bool OSCrypt::EncryptString(const std::string& plaintext,
std::string* ciphertext) {
+ if (IsEncryptionDisabled(plaintext, ciphertext)) { return true; }
DATA_BLOB input;
input.pbData = const_cast<BYTE*>(
reinterpret_cast<const BYTE*>(plaintext.data()));
@@ -49,6 +50,7 @@ bool OSCrypt::EncryptString(const std::string& plaintext,

if (g_use_legacy)
return EncryptStringWithDPAPI(plaintext, ciphertext);

@@ -160,6 +161,7 @@ bool OSCrypt::EncryptString(const std::string& plaintext,
// static
bool OSCrypt::DecryptString(const std::string& ciphertext,
std::string* plaintext) {
+ if (IsEncryptionDisabled(ciphertext, plaintext)) { return true; }
DATA_BLOB input;
input.pbData = const_cast<BYTE*>(
reinterpret_cast<const BYTE*>(ciphertext.data()));
+ if (IsEncryptionDisabled(plaintext, ciphertext)) { return true; }
if (!base::StartsWith(ciphertext, kEncryptionVersionPrefix,
base::CompareCase::SENSITIVE))
return DecryptStringWithDPAPI(ciphertext, plaintext);