Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Track libcore changes for OpenSSLKey

Browse Source 
Change-Id: I39f60c34daa9ccc633efb02988ea238a84e6bbf1
This commit is contained in:
Kenny Root
2013-01-22 13:25:38 -08:00
parent b1e16f11ff
commit cc1fc6b6ad
3 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
keystore/java/android/security/AndroidKeyStore.java
View File

@@ -16,9 +16,8 @@
package android.security;
import org.apache.harmony.xnet.provider.jsse.OpenSSLDSAPrivateKey;
import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine;
import org.apache.harmony.xnet.provider.jsse.OpenSSLRSAPrivateKey;
import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder;
import android.util.Log;
@@ -210,10 +209,8 @@ public class AndroidKeyStore extends KeyStoreSpi {
byte[] keyBytes = null;
final String pkeyAlias;
if (key instanceof OpenSSLRSAPrivateKey) {
pkeyAlias = ((OpenSSLRSAPrivateKey) key).getPkeyAlias();
} else if (key instanceof OpenSSLDSAPrivateKey) {
pkeyAlias = ((OpenSSLDSAPrivateKey) key).getPkeyAlias();
if (key instanceof OpenSSLKeyHolder) {
pkeyAlias = ((OpenSSLKeyHolder) key).getOpenSSLKey().getAlias();
} else {
pkeyAlias = null;
}