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

Unified Diff: net/ssl/ssl_platform_key_android.h

Issue 2291213002: Remove ENGINE indirection from Android SSLPrivateKey. (Closed)
Patch Set: re-delete undeleted files Created 4 years, 3 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
« no previous file with comments | « net/ssl/openssl_client_key_store_unittest.cc ('k') | net/ssl/ssl_platform_key_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/ssl_platform_key_android.h
diff --git a/net/ssl/test_ssl_private_key.h b/net/ssl/ssl_platform_key_android.h
similarity index 50%
copy from net/ssl/test_ssl_private_key.h
copy to net/ssl/ssl_platform_key_android.h
index f9ae906d30ad43ef54b17c35ed09bdad45592e00..95fe90a953ace18262cc154ba3109b0a72590fe7 100644
--- a/net/ssl/test_ssl_private_key.h
+++ b/net/ssl/ssl_platform_key_android.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef NET_SSL_TEST_SSL_PLATFORM_KEY_H_
-#define NET_SSL_TEST_SSL_PLATFORM_KEY_H_
+#ifndef NET_SSL_SSL_PLATFORM_KEY_ANDROID_H_
+#define NET_SSL_SSL_PLATFORM_KEY_ANDROID_H_
-#include <openssl/evp.h>
+#include <jni.h>
+#include "base/android/scoped_java_ref.h"
#include "base/memory/ref_counted.h"
-#include "crypto/scoped_openssl_types.h"
#include "net/base/net_export.h"
namespace net {
@@ -16,10 +16,10 @@ namespace net {
class SSLPrivateKey;
// Returns a new SSLPrivateKey which uses |key| for signing operations or
-// nullptr on error.
-NET_EXPORT scoped_refptr<SSLPrivateKey> WrapOpenSSLPrivateKey(
- crypto::ScopedEVP_PKEY key);
+// nullptr on error. |key| must be a java.security.PrivateKey object.
+NET_EXPORT scoped_refptr<SSLPrivateKey> WrapJavaPrivateKey(
+ const base::android::JavaRef<jobject>& key);
} // namespace net
-#endif // NET_SSL_TEST_SSL_PLATFORM_KEY_H_
+#endif // NET_SSL_SSL_PLATFORM_KEY_ANDROID_H_
« no previous file with comments | « net/ssl/openssl_client_key_store_unittest.cc ('k') | net/ssl/ssl_platform_key_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698