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

Side by Side Diff: net/android/java/src/org/chromium/net/RemoteAndroidKeyStore.java

Issue 365503007: Insulate the legacy Android client auth code from OpenSSL ABI changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mismerge Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.net; 5 package org.chromium.net;
6 6
7 import android.os.RemoteException; 7 import android.os.RemoteException;
8 import android.util.Log; 8 import android.util.Log;
9 9
10 /** 10 /**
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 return null; 109 return null;
110 } 110 }
111 111
112 @Override 112 @Override
113 public long getOpenSSLHandleForPrivateKey(AndroidPrivateKey privateKey) { 113 public long getOpenSSLHandleForPrivateKey(AndroidPrivateKey privateKey) {
114 // This should not be called as it's only for older versions of Android. 114 // This should not be called as it's only for older versions of Android.
115 assert false; 115 assert false;
116 return 0; 116 return 0;
117 } 117 }
118 118
119 @Override
120 public Object getOpenSSLEngineForPrivateKey(AndroidPrivateKey privateKey) {
121 // This should not be called as it's only for older versions of Android.
122 assert false;
123 return null;
124 }
125
119 public AndroidPrivateKey createKey(String alias) { 126 public AndroidPrivateKey createKey(String alias) {
120 try { 127 try {
121 int handle = mRemoteManager.getPrivateKeyHandle(alias); 128 int handle = mRemoteManager.getPrivateKeyHandle(alias);
122 return new RemotePrivateKey(handle, this); 129 return new RemotePrivateKey(handle, this);
123 } catch (RemoteException e) { 130 } catch (RemoteException e) {
124 e.printStackTrace(); 131 e.printStackTrace();
125 return null; 132 return null;
126 } 133 }
127 } 134 }
128 135
129 @Override 136 @Override
130 public void releaseKey(AndroidPrivateKey key) { 137 public void releaseKey(AndroidPrivateKey key) {
131 RemotePrivateKey remoteKey = (RemotePrivateKey) key; 138 RemotePrivateKey remoteKey = (RemotePrivateKey) key;
132 try { 139 try {
133 Log.d(TAG, "releaseKey"); 140 Log.d(TAG, "releaseKey");
134 mRemoteManager.releaseKey(remoteKey.getHandle()); 141 mRemoteManager.releaseKey(remoteKey.getHandle());
135 } catch (RemoteException e) { 142 } catch (RemoteException e) {
136 e.printStackTrace(); 143 e.printStackTrace();
137 } 144 }
138 } 145 }
139 } 146 }
OLDNEW
« no previous file with comments | « net/android/java/src/org/chromium/net/DefaultAndroidKeyStore.java ('k') | net/android/keystore.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698