Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(598)

Unified Diff: net/ssl/openssl_platform_key_win.cc

Issue 817653003: Update from https://crrev.com/309717 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/url_request/sdch_dictionary_fetcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/openssl_platform_key_win.cc
diff --git a/net/ssl/openssl_platform_key_win.cc b/net/ssl/openssl_platform_key_win.cc
index c625bff3b4202f0f6b1dd0e0e0a9a3f17b8210c8..82b76ca9af8067a5d2b87bd940880beb47eff6da 100644
--- a/net/ssl/openssl_platform_key_win.cc
+++ b/net/ssl/openssl_platform_key_win.cc
@@ -28,6 +28,7 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
+#include "base/profiler/scoped_tracker.h"
#include "base/win/windows_version.h"
#include "crypto/scoped_capi_types.h"
#include "crypto/wincrypt_shim.h"
@@ -196,6 +197,10 @@ int RsaMethodSign(int hash_nid,
uint8_t* out,
unsigned* out_len,
const RSA* rsa) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("424386 RsaMethodSign"));
+
// TODO(davidben): Switch BoringSSL's sign hook to using size_t rather than
// unsigned.
const KeyExData* ex_data = RsaGetExData(rsa);
@@ -431,6 +436,10 @@ int EcdsaMethodSign(const uint8_t* digest,
uint8_t* out_sig,
unsigned int* out_sig_len,
EC_KEY* ec_key) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("424386 EcdsaMethodSign"));
+
const KeyExData* ex_data = EcKeyGetExData(ec_key);
// Only CNG supports ECDSA.
if (!ex_data || ex_data->key->dwKeySpec != CERT_NCRYPT_KEY_SPEC) {
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/url_request/sdch_dictionary_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698