-
Notifications
You must be signed in to change notification settings - Fork 43
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
3 additions
and
3 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 e16046b3ff4ce43c3f789b742a5fa389a770904a Mon Sep 17 00:00:00 2001 | ||
From b2c855392e5fece1d4492f6d97ad843cf35a3f14 Mon Sep 17 00:00:00 2001 | ||
From: Dmitrii Pichulin <[email protected]> | ||
Date: Mon, 5 Aug 2019 15:55:13 +0300 | ||
Subject: [PATCH] chromium GOSTSSL | ||
|
@@ -311,7 +311,7 @@ index 9aea7f000c9f..55cea9dee2fc 100644 | |
} | ||
|
||
diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc | ||
index 1af7e165fb9b..e19dd055e2dc 100644 | ||
index 1af7e165fb9b..cb2a9240d485 100644 | ||
--- a/net/socket/ssl_client_socket_impl.cc | ||
+++ b/net/socket/ssl_client_socket_impl.cc | ||
@@ -452,6 +452,32 @@ int SSLClientSocketImpl::ExportKeyingMaterial(const base::StringPiece& label, | ||
|
@@ -368,7 +368,7 @@ index 1af7e165fb9b..e19dd055e2dc 100644 | |
+ } | ||
+ | ||
+ if (cachestring) | ||
+ [&]() NOCFI { cachestring(ssl_.get(), GetSessionCacheKey().data()); }(); | ||
+ [&]() NOCFI { cachestring(ssl_.get(), GetSessionCacheKey(base::nullopt).data()); }(); | ||
+ } | ||
+#endif | ||
+ | ||
|