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

Unified Diff: net/ssl/ssl_platform_key.h

Issue 1422573008: Plumbing SSLPrivateKey (//net) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing extra tab. Created 5 years, 2 months 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
Index: net/ssl/ssl_platform_key.h
diff --git a/net/ssl/ssl_platform_key.h b/net/ssl/ssl_platform_key.h
index bcab6a4c32d0c9b355fe364915ca1095fb4eba89..f8b0cc54bd4228ec61e7188d79cd22b7615e96e8 100644
--- a/net/ssl/ssl_platform_key.h
+++ b/net/ssl/ssl_platform_key.h
@@ -5,8 +5,14 @@
#ifndef NET_SSL_SSL_PLATFORM_KEY_H_
#define NET_SSL_SSL_PLATFORM_KEY_H_
+#include "base/lazy_instance.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "net/base/net_export.h"
+
+#if defined(OS_ANDROID)
+#include "crypto/scoped_openssl_types.h"
+#endif
namespace base {
class SequencedTaskRunner;
@@ -17,13 +23,16 @@ namespace net {
class SSLPrivateKey;
class X509Certificate;
+#if defined(OS_ANDROID)
+// Wraps a ScopedEVP_PKEY into an SSLPrivateKey.
+NET_EXPORT scoped_refptr<SSLPrivateKey> WrapOpenSSLPrivateKey(
+ crypto::ScopedEVP_PKEY key);
davidben 2015/11/04 00:17:38 Does this need to be exported? Everything's just c
svaldez 2015/11/04 16:55:52 Done.
+#endif
// Looks up the private key from the platform key store corresponding to
-// |certificate|'s public key and returns an SSLPrivateKey which offloads
-// signing operations to |task_runner|. |task_runner| is a SequencedTaskRunner
-// to allow for buggy third-party smartcard drivers.
-scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey(
- X509Certificate* certificate,
- scoped_refptr<base::SequencedTaskRunner> task_runner);
+// |certificate|'s public key and returns an SSLPrivateKey backed by the
+// playform key.
+NET_EXPORT scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
+ X509Certificate* certificate);
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698