diff options
| author | Kenny Root <kroot@google.com> | 2013-01-22 13:25:38 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-01-22 15:22:56 -0800 |
| commit | cc1fc6b6adc1edc2acaa42205b4ec5ca00bfd353 (patch) | |
| tree | 299d31dd411af8ca6121807073004701464232e9 /keystore/java | |
| parent | b1e16f11ffd3a391be1a44a352c122b6dad1e8a5 (diff) | |
| download | frameworks_base-cc1fc6b6adc1edc2acaa42205b4ec5ca00bfd353.zip frameworks_base-cc1fc6b6adc1edc2acaa42205b4ec5ca00bfd353.tar.gz frameworks_base-cc1fc6b6adc1edc2acaa42205b4ec5ca00bfd353.tar.bz2 | |
Track libcore changes for OpenSSLKey
Change-Id: I39f60c34daa9ccc633efb02988ea238a84e6bbf1
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/AndroidKeyStore.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/keystore/java/android/security/AndroidKeyStore.java b/keystore/java/android/security/AndroidKeyStore.java index aabfcae..65d7b8f 100644 --- a/keystore/java/android/security/AndroidKeyStore.java +++ b/keystore/java/android/security/AndroidKeyStore.java @@ -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; } |